From 5a6d4b6ffadbe81384a8e3cae1467a432c2234a1 Mon Sep 17 00:00:00 2001 From: guigues Date: Fri, 1 Feb 2008 12:45:57 +0000 Subject: [PATCH] *** empty log message *** --- kernel/CMakeLists.txt | 26 ------------------- ...TKConfigureBbtkConfigXmlForBuildTree.cmake | 21 +++++++++++++++ kernel/cmake/BBTKConfigurePackage.cmake | 14 ++++++---- kernel/cmake/BBTKConfigurePackage_doc.cmake | 17 +++--------- kernel/{ => cmake}/bbtk_config_build.xml.in | 6 ++++- kernel/src/cmake/bbtkConfigure.h.in | 9 ++++--- 6 files changed, 44 insertions(+), 49 deletions(-) create mode 100644 kernel/cmake/BBTKConfigureBbtkConfigXmlForBuildTree.cmake rename kernel/{ => cmake}/bbtk_config_build.xml.in (55%) diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index 4f223b1..47be68f 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -16,32 +16,6 @@ IF(BUILD_APPLICATIONS) ENDIF(BUILD_APPLICATIONS) #----------------------------------------------------------------------------- - -#----------------------------------------------------------------------------- -# bbtk_config.xml for the build tree -#MESSAGE(ERROR "'${BBTK_BIN_PATH}'") -IF(UNIX) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in - ${EXECUTABLE_OUTPUT_PATH}/bbtk_config.xml - @ONLY IMMEDIATE - ) -ELSE(UNIX) - SET(BBTK_BIN_PATH_OUTPUT ${EXECUTABLE_OUTPUT_PATH}/Debug ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in - ${EXECUTABLE_OUTPUT_PATH}/Debug/bbtk_config.xml - @ONLY IMMEDIATE - ) - SET(BBTK_BIN_PATH_OUTPUT ${EXECUTABLE_OUTPUT_PATH}/Release ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in - ${EXECUTABLE_OUTPUT_PATH}/Release/bbtk_config.xml - @ONLY IMMEDIATE - ) -ENDIF(UNIX) -#----------------------------------------------------------------------------- - #----------------------------------------------------------------------------- # Recurse into cmake folder to install files SUBDIRS(cmake) diff --git a/kernel/cmake/BBTKConfigureBbtkConfigXmlForBuildTree.cmake b/kernel/cmake/BBTKConfigureBbtkConfigXmlForBuildTree.cmake new file mode 100644 index 0000000..2b9155f --- /dev/null +++ b/kernel/cmake/BBTKConfigureBbtkConfigXmlForBuildTree.cmake @@ -0,0 +1,21 @@ +#----------------------------------------------------------------------------- +# bbtk_config.xml for the build tree +IF(UNIX) + CONFIGURE_FILE( + ${BBTK_CMAKE_DIR}/bbtk_config_build.xml.in + ${EXECUTABLE_OUTPUT_PATH}/bbtk_config.xml + @ONLY IMMEDIATE + ) +ELSE(UNIX) + CONFIGURE_FILE( + ${BBTK_CMAKE_DIR}/bbtk_config_build.xml.in + ${EXECUTABLE_OUTPUT_PATH}/Debug/bbtk_config.xml + @ONLY IMMEDIATE + ) + CONFIGURE_FILE( + ${BBTK_CMAKE_DIR}/bbtk_config_build.xml.in + ${EXECUTABLE_OUTPUT_PATH}/Release/bbtk_config.xml + @ONLY IMMEDIATE + ) +ENDIF(UNIX) +#----------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake index 7c4ce86..1faac16 100644 --- a/kernel/cmake/BBTKConfigurePackage.cmake +++ b/kernel/cmake/BBTKConfigurePackage.cmake @@ -1,11 +1,15 @@ #--------------------------------------------------------------------------- # If not a core package must include necessary cmake scripts IF(NOT BBTK_CORE_PACKAGE) -## TO DO -INCLUDE(${BBTK_CMAKE_DIR}/BBTKBuildAllOption.cmake) -INCLUDE(${BBTK_CMAKE_DIR}/BBTKMacros.cmake) -INCLUDE(${BBTK_CMAKE_DIR}/BBTKFindLibraries.cmake) -# etc. + # + INCLUDE(${BBTK_CMAKE_DIR}/BBTKBuildAllOption.cmake) + INCLUDE(${BBTK_CMAKE_DIR}/BBTKMacros.cmake) + INCLUDE(${BBTK_CMAKE_DIR}/BBTKFindLibraries.cmake) + #------------------------------------------------------------------------- + # Configure bbtk_config_build.xml.in for bbi to find the bbs + INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigureBbtkConfigXmlForBuildTree.cmake) + #------------------------------------------------------------------------- + # ENDIF(NOT BBTK_CORE_PACKAGE) #--------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKConfigurePackage_doc.cmake b/kernel/cmake/BBTKConfigurePackage_doc.cmake index 453bb78..8b6a5fd 100644 --- a/kernel/cmake/BBTKConfigurePackage_doc.cmake +++ b/kernel/cmake/BBTKConfigurePackage_doc.cmake @@ -1,26 +1,18 @@ #--------------------------------------------------------------------------- # If not a core package -# set the build doc option -# and include necessary cmake scripts +# Create the build doc options IF(NOT BBTK_CORE_PACKAGE) -## TO DO -# INCLUDE(${BBTK_CMAKE_DIR}/BBTKMacros.cmake) -# INCLUDE(${BBTK_CMAKE_DIR}/BBTKFindLibraries.cmake) -# etc. OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC "Build the bbtk package ${BBTK_PACKAGE_NAME} html documentation ?" OFF) SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC) IF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC) - SET(BUILD_bbtk_DOC_BBTK_PACKAGE ON) - # INCLUDE + SET(BUILD_bbtk_DOC_PACKAGE ON) ENDIF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC) - OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC "Build the bbtk package ${BBTK_PACKAGE_NAME} doxygen documentation ?" OFF) SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC) IF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC) SET(BUILD_bbtk_DOC_DOXYGEN ON) - # INCLUDE ENDIF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC) ENDIF(NOT BBTK_CORE_PACKAGE) #--------------------------------------------------------------------------- @@ -32,9 +24,7 @@ ENDIF(NOT BBTK_CORE_PACKAGE) # Doxygen #---------------------------------------------------------------------------- IF(BUILD_bbtk_DOC_DOXYGEN) - SET(BBTK_PACKAGE_DOXYGEN_REL_PATH - ${BBTK_PACKAGE_NAME} - ) + SET(BBTK_PACKAGE_DOXYGEN_REL_PATH ${BBTK_PACKAGE_NAME}) SUBDIRS(doxygen) ENDIF(BUILD_bbtk_DOC_DOXYGEN) #---------------------------------------------------------------------------- @@ -46,6 +36,5 @@ ENDIF(BUILD_bbtk_DOC_DOXYGEN) #--------------------------------------------------------------------------- IF(BUILD_bbtk_DOC_PACKAGE) SUBDIRS(bbdoc) - #MESSAGE(ERROR "TT") ENDIF(BUILD_bbtk_DOC_PACKAGE) #--------------------------------------------------------------------------- diff --git a/kernel/bbtk_config_build.xml.in b/kernel/cmake/bbtk_config_build.xml.in similarity index 55% rename from kernel/bbtk_config_build.xml.in rename to kernel/cmake/bbtk_config_build.xml.in index 2a5ff5b..79df593 100644 --- a/kernel/bbtk_config_build.xml.in +++ b/kernel/cmake/bbtk_config_build.xml.in @@ -3,7 +3,11 @@ Sets the search directories in the build tree @BBTK_BBS_BUILD_PATH@ - . + @EXECUTABLE_OUTPUT_PATH@ +# For windows + @EXECUTABLE_OUTPUT_PATH@Debug + @EXECUTABLE_OUTPUT_PATH@Release +# @BBTK_DATA_ROOT@ @PROJECT_BINARY_DIR@ diff --git a/kernel/src/cmake/bbtkConfigure.h.in b/kernel/src/cmake/bbtkConfigure.h.in index d9654e4..465d77d 100644 --- a/kernel/src/cmake/bbtkConfigure.h.in +++ b/kernel/src/cmake/bbtkConfigure.h.in @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkConfigure.h.in,v $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/01 12:45:58 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -32,7 +32,9 @@ /* Hardcode the path to BBTK_DATA_ROOT */ +#ifndef BBTK_DATA_ROOT #define BBTK_DATA_ROOT "@BBTK_DATA_ROOT@" +#endif /* Usefull in particular for loadshared where the full path * to the lib is needed */ @@ -83,10 +85,11 @@ /* BBTK Versioning */ /* Version number. */ +#ifndef BBTK_VERSION #define BBTK_MAJOR_VERSION @BBTK_MAJOR_VERSION@ #define BBTK_MINOR_VERSION @BBTK_MINOR_VERSION@ #define BBTK_BUILD_VERSION @BBTK_BUILD_VERSION@ #define BBTK_VERSION "@BBTK_VERSION@" - +#endif #endif -- 2.46.1