X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=b1513644ce7fadb5245b3329b8d247cf375c8375;hb=19dda39fbfb4f8e1019c4f0dd37aa3afc8a3d1d6;hp=7afdea40a046d84494dc6d40dbbf00537b9c45d9;hpb=3b9ae551acae07891da406ab6fd0f0ce392dc923;p=bbtk.git diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index 7afdea4..b151364 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -120,18 +120,19 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES}) COMMAND echo ${BBFY_CXX_OUT} COMMAND echo set "Path=${crea_DIR}/bin/\;"${DLL_PATH} COMMAND echo ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q - COMMAND echo ${BBFY_CXX_OUT} +## COMMAND echo ${BBFY_CXX_OUT} 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}") ADD_CUSTOM_COMMAND( OUTPUT ${BBFY_CXX_OUT} COMMAND - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && echo $ENV{LD_LIBRARY_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q DEPENDS ${xmlfile} ${BBTK_BBFY_DEPENDENCY} ) @@ -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)