#3180 crea Feature New Normal Future - Set wx-config for wxWidgets 2.8

[crea.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2502dcf9ffe95e2c1d691a31ad834971e1194b4..c256e1dd57cc6c09da1d6c727c990cf9a4583d53 100644 (file)
--- 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}
@@ -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)
 #-----------------------------------------------------------------------------