X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FCMakeLists.txt;h=078fffd77e4ef4926da835ae08201d9b0b2ed874;hb=6d91f7afe800c870a482570e5b0243fc3f425777;hp=8987f72d724c77175c53ecc8adf305bbee9513ba;hpb=7a26044dd46cb80ab90ee1f63d3b4d8ce52b2d39;p=bbtk.git

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 8987f72..078fffd 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -93,7 +93,10 @@ ENDIF(BBTK_USE_WXWIDGETS)
 
 #-----------------------------------------------------------------------------
 # BOOST 
+SET(BBTK_USE_BOOST TRUE)
+
 IF(BBTK_USE_BOOST)
+  SET(USE_BOOST ON CACHE BOOL "Use boost C++ library" FORCE)
   SET(BBTK_LINK_LIBRARIES
     ${BBTK_LINK_LIBRARIES}
     ${BBTK_BOOST_LIBRARIES} 
@@ -110,6 +113,8 @@ IF(UNIX)
 ENDIF(UNIX)
 #-----------------------------------------------------------------------------
 
+MESSAGE(STATUS "bbtk link libraries = ${BBTK_LINK_LIBRARIES}")
+
 #-----------------------------------------------------------------------------
 # EO bbtk library dependencies
 #-----------------------------------------------------------------------------
@@ -154,17 +159,17 @@ ENDIF(NOT BBTK_INSTALL_NO_DEVELOPMENT)
 
 
 
-
 #-----------------------------------------------------------------------------
 # bbtk library creation
 #-----------------------------------------------------------------------------
 # Symbols must be exported (Windows)
 ADD_DEF(BBTK_EXPORT_SYMBOLS)
 
-ADD_DEFINITIONS(-DCHECKBOXVIEW=1)
+#ADD_DEFINITIONS(-DCHECKBOXVIEW=1)
 #-----------------------------------------------------------------------------
 # Sources files 
-FILE(GLOB SOURCES "." "*.cxx" "*.cpp" "ThirdParty/wx/treemultictrl/*.cpp")
+FILE(GLOB SOURCES "." "*.cxx" "*.cpp") 
+# "ThirdParty/wx/treemultictrl/*.cpp")
 FILE(GLOB SOURCES_H "." "*.h" )
 #-----------------------------------------------------------------------------
 # lib definition
@@ -260,6 +265,10 @@ CMAKE_CREATE_FIND_PACKAGE(${LIBRARY_NAME})
 #-----------------------------------------------------------------------------
 
 
+#-----------------------------------------------------------------------------
+# Recurse in ThirdParty to build the needed libs
+SUBDIRS(ThirdParty)
+#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # EOF