X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=acc3b33cbe61624c4202a2583a0b02fb20272b9e;hb=6e3c929c883c405e0075fa8df10b12a935979367;hp=3521361fb4d74d5c88c535946e90cd5c5f48e015;hpb=192dfdf774a06066eff90e9c50916723c8592706;p=creaContours.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3521361..acc3b33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,13 @@
-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)
@@ -11,15 +20,15 @@ IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
-FIND_PACKAGE(NDimensionsEnvironment REQUIRED)
-IF (NDimensionsEnvironment_FOUND)
-  INCLUDE(${NDimensionsEnvironment_USE_FILE})
-ENDIF(NDimensionsEnvironment_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(creaMaracasVisu REQUIRED)
+IF (creaMaracasVisu_FOUND)
+  INCLUDE(${creaMaracasVisu_USE_FILE})
+ENDIF(creaMaracasVisu_FOUND)
 
 FIND_PACKAGE(creaImageIO REQUIRED)
 IF (creaImageIO_FOUND)
@@ -57,3 +66,5 @@ INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions)
 SUBDIRS(lib)
 SUBDIRS(appli)
 SUBDIRS(bbtk)
+SUBDIRS(data)
+SUBDIRS(install)