From 5c38217a92114aeeabd96c4ac4b398da03a4430f Mon Sep 17 00:00:00 2001 From: guigues Date: Thu, 14 Feb 2008 07:31:23 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackage.cmake | 18 ++++++++++-------- ...tBasePaths.cmake => BBTKKernelConfig.cmake} | 17 ++++++++++++++++- packages/CMakeLists.txt | 3 +-- 3 files changed, 27 insertions(+), 11 deletions(-) rename kernel/cmake/{BBTKSetBasePaths.cmake => BBTKKernelConfig.cmake} (75%) diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake index e529b0a..f9451b8 100644 --- 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 65d0a34..8671319 100644 --- 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 d545116..0bef0e2 100644 --- 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) #----------------------------------------------------------------------------- -- 2.45.1