X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=8dafc522fee7090b7c72870d26fd3795bd8227f8;hb=HEAD;hp=fed56e695b6f73581f3efd4fc3a2b0964f976fd9;hpb=16fd120931b919954af5eeae8248d452b9caf37c;p=bbtkGEditor.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fed56e6..8dafc52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,31 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  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.
+# ------------------------------------------------------------------------ */  
+
 # ---------------------------------
 #
 # Unless you are an experimented cmake user,
 # have a look at :
-# http://www.creatis.insa-lyon.fr/creatools/GettingStarted_creaTools
+# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
 # before starting.
 #
 # ---------------------------------
@@ -12,10 +35,23 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT( bbtkGEditor )
 ###################################
 
+#-----------------------------------------------------------------------------
+# 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)
+#-----------------------------------------------------------------------------
+
 #==================================
 # The project version
 SET(PROJECT_MAJOR_VERSION 1)
-SET(PROJECT_MINOR_VERSION 0)
+SET(PROJECT_MINOR_VERSION 2)
 SET(PROJECT_BUILD_VERSION 0)
 
 SET(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_BUILD_VERSION}")
@@ -25,6 +61,9 @@ SET(PROJECT_VERSION_DATE "30/09/2009")
 
 #==================================
 
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
 #==================================
 # Find crea (mandatory, to use macros)
 SET(CREA_VERBOSE_CMAKE TRUE)
@@ -34,27 +73,6 @@ IF (crea_FOUND)
 ENDIF(crea_FOUND)
 #==================================
 
-#==================================
-FIND_PACKAGE(creaMaracasVisu REQUIRED)
-IF (creaMaracasVisu_FOUND)
-  INCLUDE(${creaMaracasVisu_USE_FILE})
-ENDIF(creaMaracasVisu_FOUND)
-#==================================
-
-
-#==================================
-# Find and use the Black Box Toolkit
-# Search BBTK
-FIND_PACKAGE(BBTK REQUIRED)
-MARK_AS_ADVANCED(BBTK_DIR)
-# If bbtk found
-IF(BBTK_FOUND)
-  INCLUDE(${BBTK_USE_FILE})
-ENDIF(BBTK_FOUND)
-#==================================
-
-
-
 
 #==================================
 # Do not allow to build inside the source tree
@@ -92,6 +110,26 @@ SET(USE_BOOST     ON)
 CREA_FIND_AND_USE_LIBRARIES()
 #==================================
 
+
+#==================================
+FIND_PACKAGE(creaMaracasVisu REQUIRED)
+IF (creaMaracasVisu_FOUND)
+  INCLUDE(${creaMaracasVisu_USE_FILE})
+ENDIF(creaMaracasVisu_FOUND)
+#==================================
+
+#==================================
+# Find and use the Black Box Toolkit
+# Search BBTK
+FIND_PACKAGE(BBTK REQUIRED)
+MARK_AS_ADVANCED(BBTK_DIR)
+# If bbtk found
+IF(BBTK_FOUND)
+  INCLUDE(${BBTK_USE_FILE})
+ENDIF(BBTK_FOUND)
+#==================================
+
+
 #==================================
 # Where to put executables and libs
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -108,8 +146,7 @@ MARK_AS_ADVANCED(
   INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
 
- # // if the previous one is not enough :  (JPRx)
- #   Add here the directories holding the .h you need
+ # USER! : Add here the directories holding the .h you need  
     
  #   ${PROJECT_SOURCE_DIR}/lib/_YOUR_OWN_LIBRARY_SOURCE_DIRECTORY_
  
@@ -129,10 +166,10 @@ SET(BBTK_DOC_BUILD_PATH
    )
 #==================================
 
-# Subdirs
-SUBDIRS(lib)
-SUBDIRS(appli)
-SUBDIRS(doc)
-SUBDIRS(data)
-SUBDIRS(install)
+# ADD_SUBDIRECTORY
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(install)
 #==================================