X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKCreatePackageBBdoc.cmake;h=b6145874ea707968a3d8c9a4b8f145303e77a225;hb=b838e74e8b1e67f28442e6394f9220f41a7d546a;hp=90266ac09d7be4708b7aa912dd93d5868c145d36;hpb=47bf7b6f1893730f956ccbdc685794b3eb7fc088;p=bbtk.git

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index 90266ac..b614587 100644
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -30,23 +30,23 @@ 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)
@@ -57,6 +57,8 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
       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)
   ADD_CUSTOM_TARGET(bbdoc_${PACKAGE_NAME} ALL
     DEPENDS ${DOC_OUTPUT} 
@@ -67,11 +69,13 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     DESTINATION ${BBTK_BBDOC_INSTALL_PATH}
     )   
   
-  # runs bbtk-make-index as a post install step
-  IF(NOT BBTK_CORE_PACKAGE)
-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbtk-make-index)")
-  ENDIF(NOT BBTK_CORE_PACKAGE)
-
+  IF(NOT WIN32)
+    # runs bbtk-make-index as a post install step
+    # does not work on windaube
+    IF(NOT BBTK_CORE_PACKAGE)
+      INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbtk-make-index)")
+    ENDIF(NOT BBTK_CORE_PACKAGE)
+  ENDIF(NOT WIN32)
 
   
 ENDMACRO(BBTK_CREATE_PACKAGE_BBDOC NAME)