From: Eduardo Davila Date: Fri, 15 Apr 2011 12:23:31 +0000 (+0000) Subject: no message X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2441c154e1940e42455187049718d0a15d7fb81f;p=bbtk.git no message --- diff --git a/kernel/cmake/BBTKConfigurePackage_bbs.cmake b/kernel/cmake/BBTKConfigurePackage_bbs.cmake index c190771..9239bde 100644 --- a/kernel/cmake/BBTKConfigurePackage_bbs.cmake +++ b/kernel/cmake/BBTKConfigurePackage_bbs.cmake @@ -5,9 +5,15 @@ IF(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_BOXES) ${BBTK_PACKAGE_NAME}_BBS_BOXES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "boxes/*.bbs" + ) + + FILE(GLOB + ${BBTK_PACKAGE_NAME}_BBG_BOXES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "boxes/*.bbg" ) + # !! Produces a cmake seg. fault : # FILE(GLOB # ${BBTK_PACKAGE_NAME}_BBS_BOXES @@ -20,11 +26,17 @@ ENDIF(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_BOXES) #---------------------------------------------------------------------------- IF(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_APPLI) + FILE(GLOB ${BBTK_PACKAGE_NAME}_BBS_APPLI RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "appli/*.bbs" + ) + FILE(GLOB ${BBTK_PACKAGE_NAME}_BBG_APPLI + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "appli/*.bbg" ) + + ENDIF(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_APPLI) #---------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake index 9d144af..31ced06 100644 --- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake +++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake @@ -2,7 +2,59 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT BBTK_PACKAGE_NAME BBTK_PACKAGE_BBS_BOXES BBTK_PACKAGE_BBS_APPLI ) - # Creates the file ${BBTK_PACKAGE_NAME}.bbp + + ## --Configure and installing bbg boxes-- + FOREACH(bbg ${BBTK_PACKAGE_BBG_BOXES}) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/${bbg} + ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbg} + COPYONLY + ) + GET_FILENAME_COMPONENT(bbs_path ${bbg} PATH) + IF(WIN32) + INSTALL( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbg} + DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbg_path} + ) + ELSE(WIN32) + INSTALL( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbg} + DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbg_path} + ) + ENDIF(WIN32) + ENDFOREACH(bbg) + + + ## --Configure and installing bbg appli-- + FOREACH(bbg ${BBTK_PACKAGE_BBG_APPLI}) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/${bbg} + ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbg} + COPYONLY + ) + GET_FILENAME_COMPONENT(bbs_path ${bbg} PATH) + IF(WIN32) + INSTALL( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbg} + DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbg_path} + ) + ELSE(WIN32) + INSTALL( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbg} + DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbg_path} + ) + ENDIF(WIN32) + ENDFOREACH(bbg) + + + + + + + + + ## --Configure and installing bbs boxes-- + # --Creates the file ${BBTK_PACKAGE_NAME}.bbp-- SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbp) FILE(WRITE "${OUTPUT_FILE}" @@ -51,6 +103,10 @@ INSTALL( ) ENDIF(WIN32) ENDFOREACH(bbs) + + + + ## --Configure and installing bbs appli-- FILE(APPEND "${OUTPUT_FILE}" "#-----------------------------------------\n" @@ -84,6 +140,7 @@ ENDIF(WIN32) "#-----------------------------------------\n" "package ${BBTK_PACKAGE_NAME}\n" ) + FOREACH(bbs ${BBTK_PACKAGE_BBS_APPLI}) GET_FILENAME_COMPONENT(filename "${bbs}" NAME_WE)