X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=dc6700bf3b34a80ede1f8f4f1cedced5ca46de19;hb=63a8e0c05b4e25f152c7502530c51f9ba6539648;hp=080c02fe66504ba7d4e206bcc819b7a0d35300ef;hpb=1748e90d1ea0278fb63f33b5d3af75633cbc8997;p=bbtk.git diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index 080c02f..dc6700b 100644 --- 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,32 +315,40 @@ ENDIF(CHCON_LIBRARIES) ## bbpConfigurator create de PACKAGE.bbp file ## bbConfigurator - IF (WIN32) + + +IF (WIN32) MAKE_DLL_PATH() - ADD_CUSTOM_COMMAND( - 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}/ - ) - ELSE(WIN32) +## 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_COMMAND( - TARGET bb${BBTK_PACKAGE_NAME} POST_BUILD + 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}/ ) - ENDIF(WIN32) + add_dependencies( bb${BBTK_PACKAGE_NAME}.bbp bbpConfigurator ) +ENDIF(WIN32) + - SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbp) - IF(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) +ELSE(WIN32 ) INSTALL( FILES ${OUTPUT_FILE} DESTINATION ${BBTK_BBS_INSTALL_PATH} # DESTINATION ${BBTK_BBS_REL_PATH} ) - ENDIF(WIN32) +ENDIF(WIN32)