-flip

[creaContours.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7425ea94d9f754c0be2613f634651c1287f091c3..f43a315775ebf27e76eee430e7f67da5a0e81ff0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,15 @@ PROJECT(creaContours)
 
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 3)
+SET(PROJECT_BUILD_VERSION 4)
 
+#==================================
+
+# 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)
@@ -29,6 +36,20 @@ IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
+
+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)
+
+OPTION (${PROJECT_NAME}_DOC "${PROJECT_NAME}_DOC" OFF)
+
+CREA_FIND_AND_USE_LIBRARIES()
+
+
 FIND_PACKAGE(creaEnvironment REQUIRED)
 IF (creaEnvironment_FOUND)
   INCLUDE(${creaEnvironment_USE_FILE})
@@ -39,28 +60,14 @@ 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)
 
 
-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)
 
-OPTION (${PROJECT_NAME}_DOC "${PROJECT_NAME}_DOC" OFF)
 
-CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -70,9 +77,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)