X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=d127a67d68004d1b28467c9aba749b592ed58361;hb=cc4fb89e6ab8668e7e8830a2e65dc53dc1773de5;hp=89954c7e842c9acc8e357e815e9c58deeeca2594;hpb=8f2fc8236f01d70abd3e4abe4152ea7985ab5b79;p=creaBruker.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89954c7..d127a67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,13 +2,23 @@
 #
 # Unless you are an experimented cmake user,
 # have a look at :
-# http://www.creatis.insa-lyon.fr/creatools/GettingStarted_creaTools
+# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
 # before starting.
 #
 # ---------------------------------
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
+#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
+
+# 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 CMP0005 NEW)  
+  CMAKE_POLICY(SET CMP0011 NEW)
+ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+
+
 ###################################
 PROJECT(creaBruker)
 ###################################
@@ -17,7 +27,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}")
 
@@ -47,9 +57,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   "Use GDCM"   ON)
 SET(USE_GDCM_VTK  ON)
-SET(USE_GDCM2     OFF)
+OPTION(USE_GDCM2  "Use gdcm 2.0.14 at least"   OFF)
 SET(USE_WXWIDGETS OFF)
 SET(USE_KWWIDGETS OFF)
 SET(USE_VTK       OFF)
@@ -70,6 +80,8 @@ SET(USE_TTH       OFF)
 CREA_FIND_AND_USE_LIBRARIES()
 #==================================
 
+
+
 #==================================
 # Where to put executables and libs
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})