*** empty log message ***

[bbtk.git] / kernel / cmake / BBTKCreatePackageBBdoc.cmake

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index c971745209a36e5522e3138173bb81e75be6a44d..90266ac09d7be4708b7aa912dd93d5868c145d36 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -36,8 +36,8 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     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 ${BBTK_BIN_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )    
-    set(command1 cd "${BBTK_BIN_PATH}/../bbs/") 
+    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 -q ${OUTPUT_FILE}) 
     set(command4 del bb${BBTK_PACKAGE_NAME}.dll)
@@ -50,10 +50,11 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
       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 ${BBTK_BIN_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)
@@ -68,7 +69,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
   
   # runs bbtk-make-index as a post install step
   IF(NOT BBTK_CORE_PACKAGE)
-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND bbtk-make-index)")
+    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbtk-make-index)")
   ENDIF(NOT BBTK_CORE_PACKAGE)