X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FCMakeLists.txt;h=eeeaa6125b9a042b4eee63f1d024831d82507fc7;hb=7cc721b909aa07b7ec6f0eaf97b8cc61de6a15fc;hp=48e2b36dc3f9fb4539fb1da4276f306a7c4a50d2;hpb=e80ce266f593f105b14c3cb7d71bac6ba6c3f4e1;p=bbtk.git

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 48e2b36..eeeaa61 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -162,7 +162,7 @@ ENDIF(BBTK_USE_QT)
 # lib definition
 ADD_LIBRARY(bbtk SHARED ${SOURCES} ${SOURCES_H})
 #-----------------------------------------------------------------------------
-TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES})
+TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES} ${BOOST_LIBRARIES}  ${crea_LIBRARIES})
 #-----------------------------------------------------------------------------
 IF(UNIX)
 SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall)
@@ -210,13 +210,14 @@ INSTALL(TARGETS bbtk DESTINATION ${BBTK_LIB_PATH})
 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)
+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})
@@ -228,7 +229,8 @@ ELSE(UNIX)
     #${EXECUTABLE_OUTPUT_REL_PATH})/Debug
     #${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_INCLUDE_PATHS include/bbtk)
+# include/bbtk/ThirdParty)
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_LIB_PATH})
 
 # OPTIONAL 
@@ -253,6 +255,7 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
 
 #-----------------------------------------------------------------------------
 CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -260,11 +263,18 @@ CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 #-----------------------------------------------------------------------------
 
 
+#-----------------------------------------------------------------------------
+# Recurse in EditorGraphicBBS to build the needed libs
+#EED ADD_SUBDIRECTORY(EditorGraphicBBS)
+#-----------------------------------------------------------------------------
+
+
 #-----------------------------------------------------------------------------
 # Recurse in ThirdParty to build the needed libs
-SUBDIRS(ThirdParty)
+#ADD_SUBDIRECTORY(ThirdParty)
 #-----------------------------------------------------------------------------
 
+
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "")