X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FCMakeLists.txt;h=449e133436b75f0e3befe4c62b993f7063e62fba;hb=cd39bfaca5c64598de7046df6989f244fc6e32cd;hp=46bc76d5ea88cbdbfb0d87b5c2b03ee94791d9b2;hpb=e68a062addb8d49203f887b1e4ce4379e5890d1a;p=bbtk.git

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 46bc76d..449e133 100644
--- 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
@@ -162,7 +188,7 @@ ENDIF(BBTK_USE_QT)
 # lib definition
 ADD_LIBRARY(bbtk SHARED ${SOURCES} ${SOURCES_H})
 #-----------------------------------------------------------------------------
-TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES} ${BOOST_LIBRARIES})
+TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES} ${BOOST_LIBRARIES}  ${crea_LIBRARIES})
 #-----------------------------------------------------------------------------
 IF(UNIX)
 SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall)
@@ -255,6 +281,7 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
 
 #-----------------------------------------------------------------------------
 CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -263,15 +290,17 @@ CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 
 
 #-----------------------------------------------------------------------------
-# Recurse in ThirdParty to build the needed libs
-#SUBDIRS(ThirdParty)
+# Recurse in EditorGraphicBBS to build the needed libs
+#EED ADD_SUBDIRECTORY(EditorGraphicBBS)
 #-----------------------------------------------------------------------------
 
+
 #-----------------------------------------------------------------------------
-# Editor Graphic BBS
-SUBDIRS(EditorGraphicBBS)
+# Recurse in ThirdParty to build the needed libs
+#ADD_SUBDIRECTORY(ThirdParty)
 #-----------------------------------------------------------------------------
 
+
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "")