2498 BBTK FeatureNewNormal wt-version kernel

[bbtk.git] / kernel / src / CMakeLists.txt

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 96ce672fd0cc035c1883cdcb6ae31cfe181e2145..44e3b2c8e411f44021be62f35f67272b1014c838 100644 (file)
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -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.
+ # ------------------------------------------------------------------------ */
+
+
 #-----------------------------------------------------------------------------
 # BUILDS AND INSTALLS THE LIBRARY BBTK
 #-----------------------------------------------------------------------------
@@ -146,7 +172,7 @@ IF(BBTK_USE_QT)
     SET(QT4_HEADERS_TO_WRAP
       bbtkQtBlackBoxDialog.h
       )
-    QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP})
+    QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
     #--------------------------------------------------------------------------- 
     # UI
     QT4_WRAP_UI(UI_SOURCES
@@ -154,6 +180,16 @@ IF(BBTK_USE_QT)
       )
     SET(SOURCES ${SOURCES} ${MOC_SOURCES} ${UI_SOURCES})
   ENDIF(QT_FOUND)
+
+# JFGA 03/12/2014 --  Temporal configuration of WT 
+# *********Missing if conditional Wt********
+   #find_package(Boost COMPONENTS system thread signals)
+   #find_library(wt wt)
+   #find_library(wtext wtext)
+   #find_library(wthttp wthttp)
+   INCLUDE_DIRECTORIES(/usr/local/lib/)
+
+
 ENDIF(BBTK_USE_QT)
 #-----------------------------------------------------------------------------
 
@@ -162,7 +198,7 @@ ENDIF(BBTK_USE_QT)
 # lib definition
 ADD_LIBRARY(bbtk SHARED ${SOURCES} ${SOURCES_H})
 #-----------------------------------------------------------------------------
-TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES} ${BOOST_LIBRARIES}  ${crea_LIBRARIES})
+TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES} ${BOOST_LIBRARIES}  ${crea_LIBRARIES} ${WT_LIBRARIES})
 #-----------------------------------------------------------------------------
 IF(UNIX)
 SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall)
@@ -255,6 +291,7 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
 
 #-----------------------------------------------------------------------------
 CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -264,13 +301,13 @@ CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 
 #-----------------------------------------------------------------------------
 # Recurse in EditorGraphicBBS to build the needed libs
-SUBDIRS(EditorGraphicBBS)
+#EED ADD_SUBDIRECTORY(EditorGraphicBBS)
 #-----------------------------------------------------------------------------
 
 
 #-----------------------------------------------------------------------------
 # Recurse in ThirdParty to build the needed libs
-#SUBDIRS(ThirdParty)
+#ADD_SUBDIRECTORY(ThirdParty)
 #-----------------------------------------------------------------------------