From: Eduardo DAVILA Date: Fri, 26 Jul 2013 13:17:56 +0000 (+0200) Subject: 2042 Feature bbpConfigurator X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=81a683723bc158097ee6ee4d3dfcceb3fdf1ac87;p=bbtk.git 2042 Feature bbpConfigurator --- diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index 7afdea4..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}") @@ -318,17 +319,22 @@ ENDIF(CHCON_LIBRARIES) IF (WIN32) MAKE_DLL_PATH() - ADD_CUSTOM_TARGET( ${BBTK_PACKAGE_NAME}.bbp ALL - COMMAND set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../bbs/boxes/ ${BBTK_PACKAGE_NAME} ${BBTK_BBS_BUILD_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( ${BBTK_PACKAGE_NAME}.bbp ALL + 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) -add_dependencies(${BBTK_PACKAGE_NAME}.bbp bbpConfigurator ) SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbp)