BUG 1439 and 1438

[creaContours.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b341cec0d34d91d9360ec08cedd83ce040c76d1a..f43a315775ebf27e76eee430e7f67da5a0e81ff0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ PROJECT(creaContours)
 
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 3)
+SET(PROJECT_BUILD_VERSION 4)
 
 #==================================
 
@@ -36,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})
@@ -52,17 +66,8 @@ IF (creaImageIO_FOUND)
 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})