X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKFindLibraries.cmake;h=afd65ed40d965aecee059695924ed37dd8f2ec49;hb=32f572e3d47f4c17b65787a6616a73e9d718c04e;hp=463a773aaad0ea26a929f37c5c9434ec38fef48c;hpb=0dcf2138dfa1164b61a8b1aecbe7b32f3f952181;p=bbtk.git

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 463a773..afd65ed 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -6,13 +6,14 @@ MESSAGE ( STATUS "     LOOKING FOR LIBRARIES NEEDED")
 MESSAGE ( STATUS "=======================================")
 MESSAGE ( STATUS "")
 #-----------------------------------------------------------------------------
-  
+
 #-----------------------------------------------------------------------------
 # 11/12/08 : BBTK IS NOW BASED ON crea
 SET(CREA_VERBOSE_CMAKE TRUE)
-FIND_PACKAGE(crea REQUIRED)
+FIND_PACKAGE(crea REQUIRED )
+set(crea_BUILD_SETTINGS_FILE OFF)
 IF (crea_FOUND)
-  INCLUDE(${crea_USE_FILE})
+  INCLUDE(${crea_USE_FILE} )
 ENDIF(crea_FOUND)
 #-----------------------------------------------------------------------------
 
@@ -21,32 +22,31 @@ ENDIF(crea_FOUND)
 # USE SHIPPED BOOST ?
 IF(BBTK_KERNEL OR BBTK_CORE_PACKAGE)
 
-IF(BBTK_USE_SHIPPED_BOOST)
+#IF(BBTK_USE_SHIPPED_BOOST)
 
-  MESSAGE ( STATUS "=======================================")
-  MESSAGE ( STATUS "bbtk uses shipped boost C++ library (${BBTK_SHIPPED_BOOST})")
-  INCLUDE_DIRECTORIES( 
-    ${PROJECT_SOURCE_DIR}/kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST})
+#  MESSAGE ( STATUS "=======================================")
+#  MESSAGE ( STATUS "bbtk uses shipped boost C++ library (${BBTK_SHIPPED_BOOST})")
+#  INCLUDE_DIRECTORIES( 
+#    ${PROJECT_SOURCE_DIR}/kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST})
 
   # TO DO : CLEANLY BLOCK auto_link.hpp INCLUSION 
   #CREA_DEFINE(BOOST_SIGNALS_NO_LIB)
-  SET(BBTK_BOOST_LIBRARIES
-    bbtk_boost_signals
-    )  
+#  SET(BBTK_BOOST_LIBRARIES
+#    bbtk_boost_signals
+#    )  
   
-ELSE(BBTK_USE_SHIPPED_BOOST)
+#ELSE(BBTK_USE_SHIPPED_BOOST)
   SET(USE_BOOST ON CACHE BOOL "Use boost C++ library" FORCE)
-  SET(BBTK_BOOST_LIBRARIES
-    boost_signals
-    )
-ENDIF(BBTK_USE_SHIPPED_BOOST)
+#  SET(BBTK_BOOST_LIBRARIES
+#    boost_signals
+#    )
+#ENDIF(BBTK_USE_SHIPPED_BOOST)
 
 ENDIF(BBTK_KERNEL OR BBTK_CORE_PACKAGE)
 #-----------------------------------------------------------------------------
 
 
 
-
 #-----------------------------------------------------------------------------
 CREA_FIND_AND_USE_LIBRARIES()
 #-----------------------------------------------------------------------------
@@ -85,6 +85,16 @@ IF(BBTK_USE_KWWIDGETS)
 ENDIF(BBTK_USE_KWWIDGETS)
 #-----------------------------------------------------------------------------
 
+#-----------------------------------------------------------------------------
+# QT
+IF(BBTK_USE_QT)
+  SET(BBTK_LINK_LIBRARIES
+    ${BBTK_LINK_LIBRARIES}
+    ${QT_LIBRARIES} 
+    )
+ENDIF(BBTK_USE_QT)
+#-----------------------------------------------------------------------------
+
 #-----------------------------------------------------------------------------
 # BOOST 
 SET(BBTK_LINK_LIBRARIES