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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bb441a..5076630 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,38 @@
-PROJECT(CreaContours)
+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)
+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 1)
 
 SET(CREA_VERBOSE_CMAKE TRUE)
 
+
 FIND_PACKAGE(crea REQUIRED)
 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(maracasVisuLib REQUIRED)
-IF (maracasVisuLib_FOUND)
-  INCLUDE(${maracasVisuLib_USE_FILE})
-ENDIF(maracasVisuLib_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(creaImageIO REQUIRED)
 IF (creaImageIO_FOUND)
@@ -27,11 +40,13 @@ IF (creaImageIO_FOUND)
 ENDIF(creaImageIO_FOUND)
 
 
-SET(USE_GDCM ON)
+
+
+SET(USE_GDCM OFF)
 SET(USE_GDCM_VTK ON)
 SET(USE_WXWIDGETS ON)
 SET(USE_VTK ON)
-SET(USE_ITK OFF)
+SET(USE_ITK ON)
 SET(USE_BOOST OFF)
 
 CREA_FIND_AND_USE_LIBRARIES()
@@ -54,6 +69,9 @@ INCLUDE_DIRECTORIES(lib/Interface_ManagerContour_NDimensions)
 INCLUDE_DIRECTORIES(lib/Interface_Icons_NDimensions)
 INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions)
 
+
 SUBDIRS(lib)
 SUBDIRS(appli)
 SUBDIRS(bbtk)
+SUBDIRS(data)
+SUBDIRS(install)