X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKFindLibraries.cmake;h=c516a8274894cb24b1745a5e92490fbf9a853bf4;hb=8255bb1a77a5001aea3a2f940fad2b22e5016532;hp=023c175743fd4cd225b19b029eab59e78d1e470e;hpb=98d1e0eb1df1829dc7fc7e67f5b516e2b75d2730;p=bbtk.git

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 023c175..c516a82 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -6,7 +6,7 @@ MESSAGE ( STATUS "     LOOKING FOR LIBRARIES NEEDED")
 MESSAGE ( STATUS "=======================================")
 MESSAGE ( STATUS "")
 #-----------------------------------------------------------------------------
-  
+
 #-----------------------------------------------------------------------------
 # 11/12/08 : BBTK IS NOW BASED ON crea
 SET(CREA_VERBOSE_CMAKE TRUE)
@@ -19,28 +19,29 @@ ENDIF(crea_FOUND)
 
 #-----------------------------------------------------------------------------
 # USE SHIPPED BOOST ?
-IF(BBTK_CORE_PACKAGE)
+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_CORE_PACKAGE)
+ENDIF(BBTK_KERNEL OR BBTK_CORE_PACKAGE)
 #-----------------------------------------------------------------------------
 
 
@@ -53,7 +54,7 @@ CREA_FIND_AND_USE_LIBRARIES()
 #-----------------------------------------------------------------------------
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "")
-MESSAGE(STATUS "=======================================")
+MESSAGE(STATUS "=======================================") 
 MESSAGE(STATUS "   ... ALL NEEDED LIBRARIES FOUND")
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "")
@@ -84,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