X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKCreatePackageBBdoc.cmake;h=47f7aadd67dc083ebd9968099063c87d1ef2edfd;hb=7785d9f3ee33f106ad64a204d8cef883185180b0;hp=ebcee6803f48b0c810c89b43a3439d72b69fc46d;hpb=122b9776f71153add372b69b194a22bda2196f96;p=bbtk.git

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index ebcee68..47f7aad 100644
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -30,30 +30,31 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
 
   #
   IF(WIN32)
-  
-    FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
-	# %DOT_DIR%
-    set(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__${DOT_DIR}__RR__%PATH% )
-    STRING(REPLACE "__RR__" "\;" command0 ${command00} ) 
- 
-    FILE(TO_NATIVE_PATH ${EXECUTABLE_OUTPUT_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )	
-    set(command1 cd "${EXECUTABLE_OUTPUT_PATH}/../bbs/") 
-    set(command2 copy ${pathCommand2} . )
+    SET(USE_DOT TRUE)
+    MAKE_DLL_PATH()
+#    FILE(TO_NATIVE_PATH ${EXECUTABLE_OUTPUT_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )	
+    FILE(TO_NATIVE_PATH  ${BBTK_BIN_PATH}/bbtk_config.xml pathCommand2 )	
+    FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH} pathCommand1 )
+    set(command1 cd ${pathCommand1}) 
+    set(command2 copy ${pathCommand2} . )   
     set(command3 ${BBTK_BBI} -N -q ${OUTPUT_FILE}) 
-    set(command4 del bb${BBTK_PACKAGE_NAME}.dll)
+    set(command4 echo done)
+    #del bb${BBTK_PACKAGE_NAME}.dll)
     
     ADD_CUSTOM_COMMAND(
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
       #    cd ${BBTK_BIN_PATH}/../bbs/ && ${BBTK_BBI} -n ${OUTPUT_FILE}
-      set ${command0} && ${command1} && ${command2} && ${command3} && ${command4}
+      set ${DLL_PATH} && ${command1} && ${command2} && ${command3} 
+      #&& ${command4}
       DEPENDS bb${PACKAGE_NAME} 
       )
   ELSE(WIN32)
+    SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
     ADD_CUSTOM_COMMAND(
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
-      cd ${EXECUTABLE_OUTPUT_PATH} && ${BBTK_BBI} -N -q ${OUTPUT_FILE} ${BBTK_MAKE_INDEX}
+      cd ${EXECUTABLE_OUTPUT_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBI} -N -q ${OUTPUT_FILE} ${BBTK_MAKE_INDEX}
       DEPENDS bb${PACKAGE_NAME} 
       )
   ENDIF(WIN32)