Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk

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

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 252896084804c310fd4ea389f8704a4237507038..dc6700bf3b34a80ede1f8f4f1cedced5ca46de19 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -124,7 +124,8 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
        COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
  ##  COMMAND  set Path=${DLL_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
-    ${BBTK_BBFY_DEPENDENCY} 
+    ${BBTK_BBFY_DEPENDENCY}
+    ${BBTK_BBPCONFIGURATOR_DEPENDENCY}
     )
   ELSE(WIN32)
     SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
@@ -314,29 +315,40 @@ ENDIF(CHCON_LIBRARIES)
 ## bbpConfigurator   create de PACKAGE.bbp file
 ## bbConfigurator <path_to_bbs> <package_name> <output_path>
 
-  IF (WIN32)
-    MAKE_DLL_PATH()
- #   SET(command00 Path=c:/creatis/dlls__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%)
- #   STRING(REPLACE "__RR__" "\;" SETPATH ${command00} )
- #   SET(SETPATH set ${command0} &&)
 
-  ADD_CUSTOM_COMMAND( 
-        TARGET  bb${BBTK_PACKAGE_NAME} POST_BUILD
-#       COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && $(OutDir)/bbpConfigurator.exe ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
-       COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
-    ) 
-  ELSE(WIN32)
+
+IF (WIN32)
+    MAKE_DLL_PATH()
+##    ADD_CUSTOM_TARGET( ${BBTK_PACKAGE_NAME}.bbp  ALL
+ADD_CUSTOM_COMMAND(
+##    OUTPUT ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbp
+        TARGET bb${BBTK_PACKAGE_NAME} POST_BUILD
+        COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../bbs/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
+##             DEPENDS ${BBTK_BBPCONFIGURATOR_DEPENDENCY} 
+         ) 
+    add_dependencies( bb${BBTK_PACKAGE_NAME}  bbpConfigurator )
+ELSE(WIN32)
     SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
-##    ADD_CUSTOM_TARGET( bb${BBTK_PACKAGE_NAME}.bbp ALL
-####    COMMAND export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBPCONFIGURATOR}  ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
-##      COMMAND  ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
-##    ) 
-
-  ADD_CUSTOM_COMMAND( 
-        TARGET  bb${BBTK_PACKAGE_NAME} POST_BUILD
-         COMMAND  ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
+    ADD_CUSTOM_TARGET( bb${BBTK_PACKAGE_NAME}.bbp  ALL
+         COMMAND  ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../bbs/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
     ) 
+    add_dependencies( bb${BBTK_PACKAGE_NAME}.bbp  bbpConfigurator )
+ENDIF(WIN32)
 
-       
-  ENDIF(WIN32)
+
+
+SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbp)
+IF(WIN32)
+   INSTALL(
+     FILES ${OUTPUT_FILE}
+#    DESTINATION ${BBTK_BBS_INSTALL_PATH}
+     DESTINATION ${BBTK_BBS_REL_PATH}
+    )
+ELSE(WIN32     )
+     INSTALL(
+       FILES ${OUTPUT_FILE}
+       DESTINATION ${BBTK_BBS_INSTALL_PATH}
+#      DESTINATION ${BBTK_BBS_REL_PATH}
+     )
+ENDIF(WIN32)