X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=138764e023e35b0b17cf49f51195b201c32cd02e;hb=c9546c365ab501557bfd5793034730cfc3fb019d;hp=b2502dcf9ffe95e2c1d691a31ad834971e1194b4;hpb=17824854619941a12697fea8524f4218f9a14ef9;p=crea.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2502dc..138764e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,10 @@
 # ---------------------------------------------------------------------
 #
 # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
+#                        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, 
@@ -33,6 +35,18 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 PROJECT(crea)
 
+#-----------------------------------------------------------------------------
+# Configure Dart testing support.  This should be done before any
+# MESSAGE(FATAL_ERROR ...) commands are invoked.
+IF(INCLUDE_CTEST)
+  INCLUDE(CTest)
+  ENABLE_TESTING()
+ENDIF(INCLUDE_CTEST)
+IF(BUILD_TESTING)
+  SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
+  MARK_AS_ADVANCED(BUILDNAME)
+ENDIF(BUILD_TESTING)
+
 INCLUDE(Version.cmake)
 
 SET(CREA_LIBRARY_PROPERTIES ${CREA_LIBRARY_PROPERTIES}
@@ -77,7 +91,7 @@ MARK_AS_ADVANCED(
   LIBRARY_OUTPUT_PATH
   )
   
-SET (BOOST_FILESYSTEM_VERSION 2)
+## SET (BOOST_FILESYSTEM_VERSION 2)
 
 #-----------------------------------------------------------------------------
 # messages compilation options
@@ -97,8 +111,10 @@ INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
 INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/glib-2.0/include/)
 #JCP UBUNTU
 
+
 ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(appli)
 ADD_SUBDIRECTORY(lib)
 #-----------------------------------------------------------------------------