X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=00cf8c53a2b8b9a2ffce29e2a2cb3a6a9265e4d1;hb=b0a60f90532e0fef49b89328910f3b7114796498;hp=2bb441a648b65db33a854a7dfcd4479c37724700;hpb=5ad426f2313d44b6d7fe8a8b423091d099273477;p=creaContours.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bb441a..00cf8c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,34 @@
-PROJECT(CreaContours)
+# ---------------------------------
+#
+# Unless you are an experimented cmake user,
+# have a look at :
+# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
+# before starting.
+#---------------------------------
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
+
+# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
+IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+  CMAKE_POLICY(SET CMP0003 NEW)
+  CMAKE_POLICY(SET CMP0005 NEW)
+  CMAKE_POLICY(SET CMP0011 NEW)
+ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+
+PROJECT(creaContours)
 
 SET(PROJECT_MAJOR_VERSION 1)
-SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 0)
+SET(PROJECT_MINOR_VERSION 2)
+SET(PROJECT_BUILD_VERSION 3)
+
+#==================================
 
+# 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)
@@ -11,15 +36,20 @@ IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
-FIND_PACKAGE(CreaEnvironment REQUIRED)
-IF (CreaEnvironment_FOUND)
-  INCLUDE(${CreaEnvironment_USE_FILE})
-ENDIF(CreaEnvironment_FOUND)
+FIND_PACKAGE(creaEnvironment REQUIRED)
+IF (creaEnvironment_FOUND)
+  INCLUDE(${creaEnvironment_USE_FILE})
+ENDIF(creaEnvironment_FOUND)
+
+FIND_PACKAGE(creaMaracasVisu REQUIRED)
+IF (creaMaracasVisu_FOUND)
+  INCLUDE(${creaMaracasVisu_USE_FILE})
+ENDIF(creaMaracasVisu_FOUND)
 
-FIND_PACKAGE(maracasVisuLib REQUIRED)
-IF (maracasVisuLib_FOUND)
-  INCLUDE(${maracasVisuLib_USE_FILE})
-ENDIF(maracasVisuLib_FOUND)
+#FIND_PACKAGE(creaImageIO REQUIRED)
+#IF (creaImageIO_FOUND)
+#  INCLUDE(${creaImageIO_USE_FILE})
+#ENDIF(creaImageIO_FOUND)
 
 FIND_PACKAGE(creaImageIO REQUIRED)
 IF (creaImageIO_FOUND)
@@ -27,12 +57,15 @@ IF (creaImageIO_FOUND)
 ENDIF(creaImageIO_FOUND)
 
 
-SET(USE_GDCM ON)
-SET(USE_GDCM_VTK ON)
+SET(USE_GDCM OFF)
+SET(USE_GDCM_VTK OFF)
 SET(USE_WXWIDGETS ON)
 SET(USE_VTK ON)
-SET(USE_ITK OFF)
-SET(USE_BOOST OFF)
+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()
 
@@ -53,7 +86,10 @@ ENDIF(WIN32)
 INCLUDE_DIRECTORIES(lib/Interface_ManagerContour_NDimensions)
 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)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(bbtk)
+ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(install)