no message

[creaImageIO.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 931f7e59093da3f29b77d15efd041672004794e9..2d592badc6df1926d79fc6a965e5fe97328df9ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,23 @@
+#
+# Test CMake version
+#
+
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 
+#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(creaImageIO)
 
 SET(PROJECT_MAJOR_VERSION 0)
 SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 2)
+SET(PROJECT_BUILD_VERSION 3)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -15,10 +28,11 @@ ENDIF(crea_FOUND)
 SET(USE_GDCM ON)
 #SET(USE_GDCM2 ON)
 SET(USE_GDCM_VTK ON)
-SET(USE_WXWIDGETS ON)
+
 SET(USE_VTK ON)
 SET(USE_ITK OFF)
 SET(USE_BOOST ON)
+SET(USE_WXWIDGETS ON)
 
 CREA_FIND_AND_USE_LIBRARIES()
 
@@ -55,7 +69,7 @@ ELSE (BUILD_V2)
 ENDIF (BUILD_V2)
 
 
-OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" OFF)
+OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON)
 
 IF (BUILD_CREA_BRUKER)
        FIND_PACKAGE(creaBruker REQUIRED)
@@ -70,9 +84,10 @@ ENDIF (BUILD_CREA_BRUKER)
 OPTION(BUILD_CREA_PACS "Build creaImageIO with PACS connection library ?" OFF)
 IF (BUILD_CREA_PACS)
        CREA_DEFINE(BUILD_PACS)
-ENDIF(BUID_CREA_PACS)
+ENDIF(BUILD_CREA_PACS)
 
 #
 SUBDIRS(appli)
 SUBDIRS(bbtk)
+SUBDIRS(win32)
 SUBDIRS(install)