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

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 463a773..a57a707 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -1,3 +1,29 @@
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
 
 #-----------------------------------------------------------------------------
 MESSAGE ( STATUS "")
@@ -6,13 +32,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 +48,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 +111,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