fix bugs

[creaBruker.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8eba108001f8ebd7d730c037a8bb89a25900915..25ce48e8ffa6cf348e8553c7cce5a042b77cb10d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 # for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
 IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
   CMAKE_POLICY(SET CMP0003 NEW)
-  CMAKE_POLICY(SET CMP0011 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)
 
 ###################################
@@ -26,7 +26,7 @@ PROJECT(creaBruker)
 # The project version
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 0)
+SET(PROJECT_BUILD_VERSION 1)
 
 SET(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_BUILD_VERSION}")
 
@@ -56,9 +56,9 @@ CREA_PREVENT_IN_SOURCE_BUILD()
 #  if you need to LINK against crea
 #  (and not only use its macros)
 SET(USE_CREA      ON)
-SET(USE_GDCM      ON)
+OPTION(USE_GDCM      ON)
 SET(USE_GDCM_VTK  ON)
-SET(USE_GDCM2     OFF)
+OPTION(USE_GDCM2     OFF)
 SET(USE_WXWIDGETS OFF)
 SET(USE_KWWIDGETS OFF)
 SET(USE_VTK       OFF)