X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=88ab61b70476addf630ec7ea23a6124361b877b0;hb=722da70b1d42853dab5333dddc5597ec6cdf40ec;hp=d52fad965c872c60ac98a47c9aed076427d1a4b5;hpb=9e9314adadbca535d733e1593e61122c31bc0d7b;p=creaContours.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d52fad9..88ab61b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,11 @@
+# ---------------------------------
+#
+# 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 )
 
@@ -5,58 +13,52 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 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 2)
 
 SET(CREA_VERBOSE_CMAKE TRUE)
 
-message("EED creaContour "  "01")
-
 FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
-message("EED creaContour "  "02")
-
 FIND_PACKAGE(creaEnvironment REQUIRED)
 IF (creaEnvironment_FOUND)
   INCLUDE(${creaEnvironment_USE_FILE})
 ENDIF(creaEnvironment_FOUND)
 
-message("EED creaContour "  "03")
-
 FIND_PACKAGE(creaMaracasVisu REQUIRED)
 IF (creaMaracasVisu_FOUND)
   INCLUDE(${creaMaracasVisu_USE_FILE})
 ENDIF(creaMaracasVisu_FOUND)
 
-message("EED creaContour "  "04")
+#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)
-
-
-message("EED creaContour "  "05")
+FIND_PACKAGE(creaImageIO2 REQUIRED)
+IF (creaImageIO2_FOUND)
+  INCLUDE(${creaImageIO2_USE_FILE})
+ENDIF(creaImageIO2_FOUND)
 
 
 SET(USE_GDCM OFF)
-SET(USE_GDCM_VTK ON)
+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)
 
-message("EED creaContour "  "05.1")
 CREA_FIND_AND_USE_LIBRARIES()
-message("EED creaContour "  "05.2")
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -71,13 +73,11 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 ENDIF(WIN32)
 
-message("EED creaContour "  "06")
 
 INCLUDE_DIRECTORIES(lib/Interface_ManagerContour_NDimensions)
 INCLUDE_DIRECTORIES(lib/Interface_Icons_NDimensions)
 INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions)
-
-message("EED creaContour "  "07")
+INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions/ParserOsirix)
 
 SUBDIRS(lib)
 SUBDIRS(appli)