X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=8e4eec37db26ab1e9ea1e6d409927ae448b4081c;hb=8f2bd3952065a2028ae345188c3493f82eda2b27;hp=f424a75b1f9aac88f3acea8ade4b144862bfb615;hpb=f6ee0125950420d10400194d73bb9fb96f65f088;p=creaContours.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f424a75..8e4eec3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,11 +7,11 @@ IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VER
   CMAKE_POLICY(SET CMP0005 NEW)
 ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
 
-PROJECT(CreaContours)
+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)
 
@@ -20,28 +20,33 @@ 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(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)
-  INCLUDE(${creaImageIO_USE_FILE})
-ENDIF(creaImageIO_FOUND)
+#FIND_PACKAGE(creaImageIO REQUIRED)
+#IF (creaImageIO_FOUND)
+#  INCLUDE(${creaImageIO_USE_FILE})
+#ENDIF(creaImageIO_FOUND)
 
+FIND_PACKAGE(creaImageIO2 REQUIRED)
+IF (creaImageIO2_FOUND)
+  INCLUDE(${creaImageIO2_USE_FILE})
+ENDIF(creaImageIO2_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)
 
 CREA_FIND_AND_USE_LIBRARIES()
 
@@ -63,7 +68,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)