fix default_temp_dir trouble

[bbtk.git] / kernel / src / CMakeLists.txt

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 8987f72d724c77175c53ecc8adf305bbee9513ba..2543518e70e7e0749ff3bba2b75510d4a7b3bcf0 100644 (file)
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -93,11 +93,14 @@ 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} 
-    )  
+    ) 
 ENDIF(BBTK_USE_BOOST)
 #-----------------------------------------------------------------------------
 
@@ -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
@@ -172,6 +177,9 @@ ADD_LIBRARY(bbtk SHARED ${SOURCES} ${SOURCES_H})
 #-----------------------------------------------------------------------------
 TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES})
 #-----------------------------------------------------------------------------
+IF(UNIX)
+SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall)
+ENDIF(UNIX)
 
 #IF(UNIX)
 # for gnu linker : version script used to define exported symbols
@@ -200,10 +208,7 @@ TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES})
 #-----------------------------------------------------------------------------
 FILE(GLOB BBTK_HEADERS "*.h")
 INSTALL(FILES ${BBTK_HEADERS} DESTINATION include/bbtk)
-INSTALL(TARGETS bbtk DESTINATION lib)
-IF(WIN32)
-  INSTALL(TARGETS bbtk DESTINATION bin/)
-ENDIF(WIN32)
+INSTALL(TARGETS bbtk DESTINATION ${BBTK_LIB_PATH})
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -218,6 +223,12 @@ SET(LIBRARY_NAME BBTK)
 SET(${LIBRARY_NAME}_INSTALL_FOLDER bbtk)
 SET(${LIBRARY_NAME}_LIBRARIES bbtk)
 SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS kernel/src kernel/src/ThirdParty)
+IF(BBTK_USE_SHIPPED_BOOST)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
+    ${${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS} 
+    kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST}
+    )
+ENDIF(BBTK_USE_SHIPPED_BOOST)
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
     ${EXECUTABLE_OUTPUT_REL_PATH})
@@ -227,7 +238,7 @@ ELSE(UNIX)
     ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
 ENDIF(UNIX)
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/bbtk include/bbtk/ThirdParty)
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_LIB_PATH})
 
 # OPTIONAL 
 # - Set the version of your library
@@ -260,6 +271,10 @@ CMAKE_CREATE_FIND_PACKAGE(${LIBRARY_NAME})
 #-----------------------------------------------------------------------------
 
 
+#-----------------------------------------------------------------------------
+# Recurse in ThirdParty to build the needed libs
+SUBDIRS(ThirdParty)
+#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # EOF