From 0dcf2138dfa1164b61a8b1aecbe7b32f3f952181 Mon Sep 17 00:00:00 2001 From: guigues Date: Thu, 29 Jan 2009 14:11:24 +0000 Subject: [PATCH] *** empty log message *** --- kernel/CMakeLists.txt | 1 + kernel/cmake/BBTKFindLibraries.cmake | 9 +++++---- kernel/cmake/BBTKRootCMakeLists.cmake | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index 8526ed6..eeae142 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -1,3 +1,4 @@ + #----------------------------------------------------------------------------- # bbtk library SUBDIRS(src) diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake index 023c175..463a773 100644 --- a/kernel/cmake/BBTKFindLibraries.cmake +++ b/kernel/cmake/BBTKFindLibraries.cmake @@ -19,11 +19,12 @@ ENDIF(crea_FOUND) #----------------------------------------------------------------------------- # USE SHIPPED BOOST ? -IF(BBTK_CORE_PACKAGE) +IF(BBTK_KERNEL OR BBTK_CORE_PACKAGE) IF(BBTK_USE_SHIPPED_BOOST) + MESSAGE ( STATUS "=======================================") - MESSAGE(STATUS "bbtk uses shipped boost C++ library (${BBTK_SHIPPED_BOOST})") + MESSAGE ( STATUS "bbtk uses shipped boost C++ library (${BBTK_SHIPPED_BOOST})") INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST}) @@ -40,7 +41,7 @@ ELSE(BBTK_USE_SHIPPED_BOOST) ) ENDIF(BBTK_USE_SHIPPED_BOOST) -ENDIF(BBTK_CORE_PACKAGE) +ENDIF(BBTK_KERNEL OR BBTK_CORE_PACKAGE) #----------------------------------------------------------------------------- @@ -53,7 +54,7 @@ CREA_FIND_AND_USE_LIBRARIES() #----------------------------------------------------------------------------- MESSAGE(STATUS "=======================================") MESSAGE(STATUS "") -MESSAGE(STATUS "=======================================") +MESSAGE(STATUS "=======================================") MESSAGE(STATUS " ... ALL NEEDED LIBRARIES FOUND") MESSAGE(STATUS "=======================================") MESSAGE(STATUS "") diff --git a/kernel/cmake/BBTKRootCMakeLists.cmake b/kernel/cmake/BBTKRootCMakeLists.cmake index c314829..a5c08e5 100644 --- a/kernel/cmake/BBTKRootCMakeLists.cmake +++ b/kernel/cmake/BBTKRootCMakeLists.cmake @@ -1,5 +1,8 @@ #SET(CMAKE_SKIP_RPATH ON) +#----------------------------------------------------------------------------- +SET(BBTK_KERNEL ON) +#----------------------------------------------------------------------------- #----------------------------------------------------------------------------- SET(BBTK_CMAKE_REL_PATH kernel/cmake) -- 2.45.0