X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FCMakeLists.txt;h=eeeaa6125b9a042b4eee63f1d024831d82507fc7;hb=bf42bb34e170d933fea13937f90aefc0c4458920;hp=f9ee9f880679a566ac561d743b40df5de6a719b8;hpb=038dbbd7dd8b34107ec932a34170a4625368eb25;p=bbtk.git

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index f9ee9f8..eeeaa61 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -126,7 +126,7 @@ CREA_DEFINE(BBTK_EXPORT_SYMBOLS)
 # Sources files 
 FILE(GLOB SOURCES "." "*.cxx" "*.cpp") 
 # "ThirdParty/wx/treemultictrl/*.cpp")
-FILE(GLOB SOURCES_H "." "*.h" )
+FILE(GLOB SOURCES_H "." "*.h" "*.txx" )
 
 #-----------------------------------------------------------------------------
 IF(BBTK_USE_KWWIDGETS)
@@ -140,18 +140,20 @@ ENDIF(BBTK_USE_KWWIDGETS)
 
 #-----------------------------------------------------------------------------
 IF(BBTK_USE_QT)
-  #--------------------------------------------------------------------------- 
-  # MOC
-  SET(QT4_HEADERS_TO_WRAP
-    bbtkQtBlackBoxDialog.h
-    )
-  QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP})
-  #--------------------------------------------------------------------------- 
-  # UI
-  QT4_WRAP_UI(UI_SOURCES
-    bbtkQtBlackBoxDialog.ui
-    )
-  SET(SOURCES ${SOURCES} ${MOC_SOURCES} ${UI_SOURCES})
+  IF(QT_FOUND)
+    #--------------------------------------------------------------------------- 
+    # MOC
+    SET(QT4_HEADERS_TO_WRAP
+      bbtkQtBlackBoxDialog.h
+      )
+    QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP})
+    #--------------------------------------------------------------------------- 
+    # UI
+    QT4_WRAP_UI(UI_SOURCES
+      bbtkQtBlackBoxDialog.ui
+      )
+    SET(SOURCES ${SOURCES} ${MOC_SOURCES} ${UI_SOURCES})
+  ENDIF(QT_FOUND)
 ENDIF(BBTK_USE_QT)
 #-----------------------------------------------------------------------------
 
@@ -160,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)
@@ -192,7 +194,7 @@ ENDIF(UNIX)
 
 
 #-----------------------------------------------------------------------------
-FILE(GLOB BBTK_HEADERS "*.h")
+FILE(GLOB BBTK_HEADERS "*.h" "*.txx")
 INSTALL(FILES ${BBTK_HEADERS} DESTINATION include/bbtk)
 INSTALL(TARGETS bbtk DESTINATION ${BBTK_LIB_PATH})
 #-----------------------------------------------------------------------------
@@ -208,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})
@@ -226,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 
@@ -251,6 +255,7 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
 
 #-----------------------------------------------------------------------------
 CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -258,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 "")