Feature #1787

[creaContours.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 637ef1751ab248da6b7912c28641184af61f9038..dddf791c9e5e908d6652963a90ff1ff17824bdc7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,28 @@
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 # ---------------------------------
 #
 # Unless you are an experimented cmake user,
@@ -19,9 +44,16 @@ ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_
 PROJECT(creaContours)
 
 SET(PROJECT_MAJOR_VERSION 1)
-SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 3)
+SET(PROJECT_MINOR_VERSION 3)
+SET(PROJECT_BUILD_VERSION 0)
 
+#==================================
+
+# 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)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -29,6 +61,20 @@ IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
+
+SET(USE_GDCM      OFF)
+SET(USE_GDCM_VTK  OFF)
+SET(USE_WXWIDGETS ON)
+SET(USE_VTK       ON)
+SET(USE_ITK       ON)
+SET(USE_BOOST     ON)
+SET(USE_XERCES    ON)
+
+OPTION (${PROJECT_NAME}_DOC "${PROJECT_NAME}_DOC" OFF)
+
+CREA_FIND_AND_USE_LIBRARIES()
+
+
 FIND_PACKAGE(creaEnvironment REQUIRED)
 IF (creaEnvironment_FOUND)
   INCLUDE(${creaEnvironment_USE_FILE})
@@ -39,28 +85,14 @@ IF (creaMaracasVisu_FOUND)
   INCLUDE(${creaMaracasVisu_USE_FILE})
 ENDIF(creaMaracasVisu_FOUND)
 
-#FIND_PACKAGE(creaImageIO REQUIRED)
-#IF (creaImageIO_FOUND)
-#  INCLUDE(${creaImageIO_USE_FILE})
-#ENDIF(creaImageIO_FOUND)
-
 FIND_PACKAGE(creaImageIO REQUIRED)
 IF (creaImageIO_FOUND)
   INCLUDE(${creaImageIO_USE_FILE})
 ENDIF(creaImageIO_FOUND)
 
 
-SET(USE_GDCM OFF)
-SET(USE_GDCM_VTK OFF)
-SET(USE_WXWIDGETS ON)
-SET(USE_VTK ON)
-SET(USE_ITK ON)
-SET(USE_BOOST ON)
-SET(USE_XERCES ON)
 
-OPTION (${PROJECT_NAME}_DOC "${PROJECT_NAME}_DOC" OFF)
 
-CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -70,9 +102,9 @@ MARK_AS_ADVANCED(
   LIBRARY_OUTPUT_PATH
   )
   
- IF(WIN32)
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
-LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+IF(WIN32)
+    INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+    LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 ENDIF(WIN32)
 
 
@@ -81,8 +113,8 @@ INCLUDE_DIRECTORIES(lib/Interface_Icons_NDimensions)
 INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions)
 INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions/ParserOsirix)
 
-SUBDIRS(lib)
-SUBDIRS(appli)
-SUBDIRS(bbtk)
-SUBDIRS(data)
-SUBDIRS(install)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(bbtk)
+ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(install)