*** empty log message ***

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 4f223b16d4d82c236e02298e15f994a538fd8dc6..47be68f0dbffe46ff3a3598ef49715f7d73a3367 100644 (file)
--- 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 (file)
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 7c4ce86e5786b8b3b0345ae7581311d81ffea50b..1faac169a00a98b6e9369f60381e43c828e6ddaa 100644 (file)
--- 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 453bb782edd52b9749b83d214d5a74bdf3a7f4ba..8b6a5fd9685b717106329abb1d234a71986949ce 100644 (file)
--- 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 2a5ff5b4c1b7b9d25b4644f891b0d8661659a9e1..79df5936abba2e46ebd98707455723294638ee29 100644 (file)
--- a/kernel/bbtk_config_build.xml.in
+++ b/kernel/cmake/bbtk_config_build.xml.in
@@ -3,7 +3,11 @@
   <description> Sets the search directories in the build tree </description>
 
   <bbs_path> @BBTK_BBS_BUILD_PATH@ </bbs_path>
-  <package_path>.</package_path> 
+  <package_path> @EXECUTABLE_OUTPUT_PATH@ </package_path> 
+# For windows
+  <package_path> @EXECUTABLE_OUTPUT_PATH@Debug </package_path> 
+  <package_path> @EXECUTABLE_OUTPUT_PATH@Release </package_path> 
+#
   <data_path> @BBTK_DATA_ROOT@ </data_path>
 
   <default_doc_tmp>  @PROJECT_BINARY_DIR@ </default_doc_tmp>

diff --git a/kernel/src/cmake/bbtkConfigure.h.in b/kernel/src/cmake/bbtkConfigure.h.in
index d9654e4b06ca2c6801c7d647b67695535df10ee4..465d77d665bf317abdb4767a2bb88177d0529137 100644 (file)
--- 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