X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FCMakeLists.txt;h=8987f72d724c77175c53ecc8adf305bbee9513ba;hb=4a50c01b24b6c1b4eb10ff0f7a56f9e60752ad01;hp=32b8cb26e0396554c8f0441354e2f1d8ee43041b;hpb=6ea571ab3b7a539aaaca066db3941f5017920209;p=bbtk.git

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 32b8cb2..8987f72 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -91,6 +91,16 @@ IF(BBTK_USE_WXWIDGETS)
 ENDIF(BBTK_USE_WXWIDGETS)
 #-----------------------------------------------------------------------------
 
+#-----------------------------------------------------------------------------
+# BOOST 
+IF(BBTK_USE_BOOST)
+  SET(BBTK_LINK_LIBRARIES
+    ${BBTK_LINK_LIBRARIES}
+    ${BBTK_BOOST_LIBRARIES} 
+    )  
+ENDIF(BBTK_USE_BOOST)
+#-----------------------------------------------------------------------------
+
 #-----------------------------------------------------------------------------
 # On unix systems, need to link against dl for dynamic librairies open/close
 IF(UNIX)
@@ -151,9 +161,10 @@ ENDIF(NOT BBTK_INSTALL_NO_DEVELOPMENT)
 # Symbols must be exported (Windows)
 ADD_DEF(BBTK_EXPORT_SYMBOLS)
 
+ADD_DEFINITIONS(-DCHECKBOXVIEW=1)
 #-----------------------------------------------------------------------------
 # Sources files 
-FILE(GLOB SOURCES "." "*.cxx" "*.cpp")
+FILE(GLOB SOURCES "." "*.cxx" "*.cpp" "ThirdParty/wx/treemultictrl/*.cpp")
 FILE(GLOB SOURCES_H "." "*.h" )
 #-----------------------------------------------------------------------------
 # lib definition
@@ -189,7 +200,10 @@ TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES})
 #-----------------------------------------------------------------------------
 FILE(GLOB BBTK_HEADERS "*.h")
 INSTALL(FILES ${BBTK_HEADERS} DESTINATION include/bbtk)
-INSTALL(TARGETS bbtk DESTINATION bin)
+INSTALL(TARGETS bbtk DESTINATION lib)
+IF(WIN32)
+  INSTALL(TARGETS bbtk DESTINATION bin/)
+ENDIF(WIN32)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -203,7 +217,7 @@ INSTALL(TARGETS bbtk DESTINATION bin)
 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)
+SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS kernel/src kernel/src/ThirdParty)
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
     ${EXECUTABLE_OUTPUT_REL_PATH})
@@ -212,7 +226,7 @@ ELSE(UNIX)
     ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
     ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
 ENDIF(UNIX)
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/bbtk)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/bbtk include/bbtk/ThirdParty)
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
 
 # OPTIONAL