Fixed the bug with the Ubuntu 64 latest version, by modifying the

[creaContours.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cbafed4a59b5cf12a139e232ae8b45364baf398..b341cec0d34d91d9360ec08cedd83ce040c76d1a 100644 (file)
--- 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,14 +13,22 @@ 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 2)
-SET(PROJECT_BUILD_VERSION 2)
+SET(PROJECT_BUILD_VERSION 3)
+
+#==================================
+
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
 
+#==================================
+# Find crea (mandatory, to use macros)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -30,24 +46,21 @@ 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 OFF)
-SET(USE_GDCM_VTK OFF)
+SET(USE_GDCM      OFF)
+SET(USE_GDCM_VTK  OFF)
 SET(USE_WXWIDGETS ON)
-SET(USE_VTK ON)
-SET(USE_ITK ON)
-SET(USE_BOOST ON)
-SET(USE_XERCES ON)
+SET(USE_VTK       ON)
+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()
 
@@ -59,9 +72,9 @@ MARK_AS_ADVANCED(
   LIBRARY_OUTPUT_PATH
   )
   
- IF(WIN32)
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
-LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+IF(WIN32)
+    INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+    LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 ENDIF(WIN32)
 
 
@@ -70,8 +83,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)