X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKCreatePackageBBdoc.cmake;h=f2d971368c89cca6c31383583d1469ab845251ed;hb=db2adec4da5413691b7430ee1fa2354b9e53d312;hp=bd089db2aa18eca7e01aa5e6eae80685cdef54d5;hpb=d033a19d6fc7b26b442a7fadef24b5b83ad600fc;p=bbtk.git

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index bd089db..f2d9713 100644
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -27,26 +27,33 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/appli
     )
   
+
   #
   IF(WIN32)
-    FILE(TO_NATIVE_PATH ${BBTK_BIN_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )
-    set(command1 cd "${BBTK_BIN_PATH}/../bbs/") 
+  
+    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(command3 ${BBTK_BBI} -n ${OUTPUT_FILE}) 
+    set(command3 ${BBTK_BBI} -N -q ${OUTPUT_FILE}) 
     set(command4 del bb${BBTK_PACKAGE_NAME}.dll)
     
     ADD_CUSTOM_COMMAND(
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
       #    cd ${BBTK_BIN_PATH}/../bbs/ && ${BBTK_BBI} -n ${OUTPUT_FILE}
-      ${command1} && ${command2} && ${command3} && ${command4}
+      set ${command0} && ${command1} && ${command2} && ${command3} && ${command4}
       DEPENDS bb${PACKAGE_NAME} 
       )
   ELSE(WIN32)
     ADD_CUSTOM_COMMAND(
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
-      cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -n ${OUTPUT_FILE}
+      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)
@@ -59,6 +66,11 @@ 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)
+
 
   
 ENDMACRO(BBTK_CREATE_PACKAGE_BBDOC NAME)