X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FCMakeLists.txt;h=a88d416a53edb9b57929b02f9b202583758b24a5;hb=4e0c70c1aa10fed31d4a6bf30cb316eaa1194e13;hp=f1cfa69fcb4090efc402b2c2c1a3d1e159ec2104;hpb=70db75992e0ccf5ad1fab5ccf9cec013877ea3d5;p=bbtk.git

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index f1cfa69..a88d416 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -126,21 +126,43 @@ 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)
-  IF(KWWIDGETS_FOUND)
+  IF(KWWidgets_FOUND)
     include("${KWWidgets_CMAKE_DIR}/KWWidgetsWrappingMacros.cmake")
     kwwidgets_wrap_tcl(bbtk LIB_TCL_SRCS "vtkKWBlackBoxDialog.cxx" "")
     SET(SOURCES ${SOURCES} ${LIB_TCL_SRCS})
-  ENDIF(KWWIDGETS_FOUND)
+  ENDIF(KWWidgets_FOUND)
 ENDIF(BBTK_USE_KWWIDGETS)
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+IF(BBTK_USE_QT)
+  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)
+#-----------------------------------------------------------------------------
+
 
 #-----------------------------------------------------------------------------
 # 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)
@@ -172,14 +194,14 @@ 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})
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Code installing the files needed to find the lib by FIND_PACKAGE
-# Uses CMakeCreateFindPackage 
+# Uses CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
 #-----------------------------------------------------------------------------
 
 
@@ -188,22 +210,27 @@ 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})
 ELSE(UNIX)
-  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
+    ${EXECUTABLE_OUTPUT_REL_PATH}
+    .
+    )
+    #${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 
@@ -227,9 +254,8 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-# Includes CMakeCreateFindPackage
-INCLUDE(${CMakeCreateFindPackage_DIR}/CMakeCreateFindPackage.cmake)
-CMAKE_CREATE_FIND_PACKAGE(${LIBRARY_NAME})
+CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -237,11 +263,18 @@ CMAKE_CREATE_FIND_PACKAGE(${LIBRARY_NAME})
 #-----------------------------------------------------------------------------
 
 
+#-----------------------------------------------------------------------------
+# Recurse in EditorGraphicBBS to build the needed libs
+ADD_SUBDIRECTORY(EditorGraphicBBS)
+#-----------------------------------------------------------------------------
+
+
 #-----------------------------------------------------------------------------
 # Recurse in ThirdParty to build the needed libs
-SUBDIRS(ThirdParty)
+#ADD_SUBDIRECTORY(ThirdParty)
 #-----------------------------------------------------------------------------
 
+
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "")