no message

[creaContours.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c85cab4e97b5ce7c4599ad24e4d7d26353a166d..7425ea94d9f754c0be2613f634651c1287f091c3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 # 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 )
@@ -20,7 +20,7 @@ PROJECT(creaContours)
 
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 2)
+SET(PROJECT_BUILD_VERSION 3)
 
 SET(CREA_VERBOSE_CMAKE TRUE)
 
@@ -44,10 +44,10 @@ ENDIF(creaMaracasVisu_FOUND)
 #  INCLUDE(${creaImageIO_USE_FILE})
 #ENDIF(creaImageIO_FOUND)
 
-FIND_PACKAGE(creaImageIO2 REQUIRED)
-IF (creaImageIO2_FOUND)
-  INCLUDE(${creaImageIO2_USE_FILE})
-ENDIF(creaImageIO2_FOUND)
+FIND_PACKAGE(creaImageIO REQUIRED)
+IF (creaImageIO_FOUND)
+  INCLUDE(${creaImageIO_USE_FILE})
+ENDIF(creaImageIO_FOUND)
 
 
 SET(USE_GDCM OFF)
@@ -58,6 +58,8 @@ 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()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -79,8 +81,8 @@ 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)
-SUBDIRS(data)
-SUBDIRS(install)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(bbtk)
+ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(install)