*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index e529b0aca57f79de4bdc982d5ca082204d0de7e2..f9451b89e7b82c14a6d3d8b08b0958aae77872f8 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -58,7 +58,7 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
   IF(NOT ${BBTK_PACKAGE_NAME}_IN_DEPS)
     SET(BBTK_PACKAGES_DEPS "${${BBTK_PACKAGE_NAME}_DEPS};${BBTK_PACKAGES_DEPS}"
       CACHE INTERNAL "bbtk packages dependencies" FORCE)
-MESSAGE(STATUS "deps=${BBTK_PACKAGES_DEPS}")
+ #   MESSAGE(STATUS "Packages=${BBTK_PACKAGES_DEPS}")
   ENDIF(NOT ${BBTK_PACKAGE_NAME}_IN_DEPS)
   #---------------------------------------------------------------------------
 
@@ -132,14 +132,16 @@ ELSE(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
   #-------------------------------------------------------------------------
   
   #-----------------------------------------------------------------------
-  # If package deps in global deps : remove them
+  # If package deps in global deps : reset global deps
   IF(${BBTK_PACKAGE_NAME}_IN_DEPS)
-    STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};"
-      "" TEMP
-      ${BBTK_PACKAGES_DEPS})
-    
-    SET(BBTK_PACKAGES_DEPS ${TEMP}
-      CACHE INTERNAL "bbtk packages dependencies" FORCE)
+    SET(BBTK_PACKAGES_DEPS "" CACHE INTERNAL 
+      "bbtk packages dependencies" FORCE)
+#    STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};"
+#      "" TEMP
+#      ${BBTK_PACKAGES_DEPS})
+#    
+#    SET(BBTK_PACKAGES_DEPS ${TEMP}
+#      CACHE INTERNAL "bbtk packages dependencies" FORCE)
   ENDIF(${BBTK_PACKAGE_NAME}_IN_DEPS)
   #-----------------------------------------------------------------------
 

diff --git a/kernel/cmake/BBTKSetBasePaths.cmake b/kernel/cmake/BBTKKernelConfig.cmake
similarity index 75%
rename from kernel/cmake/BBTKSetBasePaths.cmake
rename to kernel/cmake/BBTKKernelConfig.cmake
index 65d0a3420314b45931f1235a561018419d57c00b..86713191cffd301d715858524063e6700bc49281 100644 (file)
--- a/kernel/cmake/BBTKSetBasePaths.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -1,3 +1,19 @@
+
+#----------------------------------------------------------------------------
+# BINARY DIR MUST BE IN INCLUDE DIRS 
+# TO FIND .h OF AUTOMATICALLY GENERATED FILES (e.g. FROM XML)
+INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/kernel/src ) 
+# SOURCES DIR MUST ALSO BE IN INCLUDE DIRS FOR FILES COMPILED IN BINARY DIR 
+# WHICH NEED TO INCLUDE OTHER FILES OF THE PACKAGE
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/kernel/src )
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+# THE PACKAGES ARE CORE ONES
+SET(BBTK_CORE_PACKAGE TRUE)
+#----------------------------------------------------------------------------
+
+
 #-----------------------------------------------------------------------------
 # Path for binaries 
 SET (EXECUTABLE_OUTPUT_REL_PATH bin)
@@ -9,7 +25,6 @@ SET (LIBRARY_OUTPUT_PATH
 #-----------------------------------------------------------------------------
 
 
-
 #-----------------------------------------------------------------------------
 # The var BBTK_BIN_PATH
 # gives the system-dependent path to output binaries

diff --git a/packages/CMakeLists.txt b/packages/CMakeLists.txt
index d545116a45d97f97e4cf19b6c71f87645f0e9136..0bef0e283a17293ba3e31ac15efb69f5a2d6da77 100644 (file)
--- a/packages/CMakeLists.txt
+++ b/packages/CMakeLists.txt
@@ -1,10 +1,9 @@
 
-SET(BBTK_CORE_PACKAGE ON)
-
 #-----------------------------------------------------------------------------
 #SUBDIRS(void)
 SUBDIRS(std)
 SUBDIRS(wx)
 SUBDIRS(itk)
 SUBDIRS(vtk)
+SUBDIRS(util)
 #-----------------------------------------------------------------------------