From ea9a967fd537db57f8f135b2a5afc065e3a0a2db Mon Sep 17 00:00:00 2001 From: guigues Date: Mon, 28 Jan 2008 10:14:16 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackage_bbs.cmake | 19 +++++++++++++++++-- .../BBTKCreatePackageIncludeScript.cmake | 19 ++++++++++++++----- packages/wx/bbs/boxes/bbDoubleSlider.bbs | 8 ++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 packages/wx/bbs/boxes/bbDoubleSlider.bbs diff --git a/kernel/cmake/BBTKConfigurePackage_bbs.cmake b/kernel/cmake/BBTKConfigurePackage_bbs.cmake index e4bf222..6d2f40a 100644 --- a/kernel/cmake/BBTKConfigurePackage_bbs.cmake +++ b/kernel/cmake/BBTKConfigurePackage_bbs.cmake @@ -2,13 +2,28 @@ #---------------------------------------------------------------------------- IF(BBTK_PACKAGE_INCLUDE_ALL_BBS_BOXES) - FILE(GLOB BBTK_PACKAGE_BBS_BOXES "boxes" "*.bbs") + FILE(GLOB + BBTK_PACKAGE_BBS_BOXES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "boxes/*.bbs" + ) + +# !! Produces a cmake seg. fault : +# FILE(GLOB +# BBTK_PACKAGE_BBS_BOXES +# "boxes/" +# ) + + ENDIF(BBTK_PACKAGE_INCLUDE_ALL_BBS_BOXES) #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- IF(BBTK_PACKAGE_INCLUDE_ALL_BBS_APPLI) - FILE(GLOB BBTK_PACKAGE_BBS_APPLI "appli" "*.bbs") + FILE(GLOB BBTK_PACKAGE_BBS_APPLI + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "appli/*.bbs" + ) ENDIF(BBTK_PACKAGE_INCLUDE_ALL_BBS_APPLI) #---------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake index f1c5f62..65f1dcd 100644 --- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake +++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake @@ -5,34 +5,43 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT BBTK_PACKAGE_NAME BBTK_PACKAGE_BB SET(OUTPUT_PATH ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}) SET(OUTPUT_FILE ${PROJECT_BINARY_DIR}/${OUTPUT_PATH}/${BBTK_PACKAGE_NAME}.bbs) - MESSAGE(ERROR "${BBTK_PACKAGE_BBS_BOXES} - ${BBTK_PACKAGE_BBS_APPLI}") + # MESSAGE(ERROR "${BBTK_PACKAGE_BBS_BOXES} - ${BBTK_PACKAGE_BBS_APPLI}") # Creates the file ${BBTK_PACKAGE_NAME}.bbs FILE(WRITE "${OUTPUT_FILE}" - "# Include script for bbtk package '${BBTK_PACKAGE_NAME}' - automatically generated by cmake (macro BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT)\n") + "#-----------------------------------------\n" + "# Include script for bbtk package '${BBTK_PACKAGE_NAME}'\n" + "# Automatically generated by cmake (macro BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT)\n") FILE(APPEND "${OUTPUT_FILE}" + "#-----------------------------------------\n" "load ${BBTK_PACKAGE_NAME}\n" + "#-----------------------------------------\n" "package ${BBTK_PACKAGE_NAME}\n" ) FOREACH(bbs ${BBTK_PACKAGE_BBS_BOXES}) FILE(APPEND "${OUTPUT_FILE}" + "#-----------------------------------------\n" "include ${bbs}\n" ) ENDFOREACH(bbs) FOREACH(bbs ${BBTK_PACKAGE_BBS_APPLI}) + GET_FILENAME_COMPONENT(filename "${bbs}" NAME_WE) FILE(APPEND "${OUTPUT_FILE}" - "define ${bbs}\n" + "#-----------------------------------------\n" + "define ${filename}\n" "include ${bbs}\n" - "endefine" + "endefine\n" ) ENDFOREACH(bbs) FILE(APPEND "${OUTPUT_FILE}" - "endpackage\n" + "#-----------------------------------------\n" + "endpackage\n" + "#-- EOF ----------------------------------\n" ) # ADD_CUSTOM_TARGET(${BBTK_PACKAGE_NAME}.bbs ALL diff --git a/packages/wx/bbs/boxes/bbDoubleSlider.bbs b/packages/wx/bbs/boxes/bbDoubleSlider.bbs new file mode 100644 index 0000000..d532e75 --- /dev/null +++ b/packages/wx/bbs/boxes/bbDoubleSlider.bbs @@ -0,0 +1,8 @@ +define DoubleSlider + description "test object" + author "laurent.guigues at creatis.insa-lyon.fr" + new Slider s1 + new Slider s2 + new Split s +# connect .. +endefine -- 2.45.1