X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fdoc%2FbbtkWebSite%2FCMakeLists.txt;h=b39212801cf7fa76f00e848b8c1427a175a47eff;hb=7785d9f3ee33f106ad64a204d8cef883185180b0;hp=cb2833445ab0969ccb12f8ab9ac4f6fe344a8a1f;hpb=eed4a68ed3d379b6d3060e7a3730d12fa806b1ed;p=bbtk.git

diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index cb28334..b392128 100644
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -34,19 +34,25 @@ CONFIGURE_FILE(
   )
 
 IF (WIN32)
-  SET(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
-  STRING(REPLACE "__RR__" "\;" command0 ${command00} ) 
-  SET(SETPATH "set ${command0} &&")
+  SET(USE_DOT TRUE)
+  MAKE_DLL_PATH()
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${INDEX_OUTPUT}
+    COMMAND 
+    set ${DLL_PATH} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
+    DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
+  )
 ELSE (WIN32)
-  SET(SETPATH "")
+   SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
+#   MESSAGE(LD_LIBRARY_PATH=${LD_LIBRARY_PATH})
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${INDEX_OUTPUT}
+    COMMAND 
+    cd ${BBTK_BIN_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
+    DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
+  )
 ENDIF (WIN32)
 
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${INDEX_OUTPUT}
-  COMMAND 
-  ${SETPATH} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
-  DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
-  )
 ADD_CUSTOM_TARGET(bbdoc_index ALL
   DEPENDS ${INDEX_OUTPUT}
   )
@@ -75,6 +81,11 @@ CONFIGURE_FILE(
   ${BBTK_BBDOC_BUILD_PATH}/bbtk-make-index
   @ONLY
   )
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/bbtk-make-index.sh.in
+  ${BBTK_BIN_PATH}/bbtk-make-index
+  @ONLY
+  )
 INSTALL(
   PROGRAMS ${BBTK_BBDOC_BUILD_PATH}/bbtk-make-index
   DESTINATION bin