X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=dc4a57d6fb196852c9f377804d97f9a4b9517bdc;hb=e71f3f9eee510c110566fbdce60c569094e45307;hp=045ec4954d10b0c4c70b148d37d27dbc542ffff8;hpb=d78f4471328131fde39ac1d76f4af536c69f07a7;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 045ec49..dc4a57d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,20 +1,10 @@
 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)
-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 0)
-
+SET(PROJECT_BUILD_VERSION 1)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -22,8 +12,8 @@ IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
-SET(USE_GDCM OFF)
-SET(USE_GDCM2 ON)
+SET(USE_GDCM ON)
+#SET(USE_GDCM2 ON)
 SET(USE_GDCM_VTK ON)
 SET(USE_WXWIDGETS ON)
 SET(USE_VTK ON)
@@ -40,18 +30,32 @@ MARK_AS_ADVANCED(
   LIBRARY_OUTPUT_PATH
   )
 
-# Includes 
-INCLUDE_DIRECTORIES(
-#  ${PROJECT_BINARY_DIR}
-  ${PROJECT_SOURCE_DIR}/src
-  )
-
 IF(WIN32)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 ENDIF(WIN32)
 
-SUBDIRS(src)
+
+OPTION(BUILD_V2 "Build Version 2 ?" OFF) 
+
+IF (BUILD_V2)
+  SET(LIBNAME creaImageIO2)
+  INCLUDE_DIRECTORIES(
+    ${PROJECT_BINARY_DIR}
+    ${PROJECT_SOURCE_DIR}/src2
+    )
+  SUBDIRS(src2)
+ELSE (BUILD_V2)
+  SET(LIBNAME creaImageIO)
+  INCLUDE_DIRECTORIES(
+    ${PROJECT_BINARY_DIR}
+    ${PROJECT_SOURCE_DIR}/src
+    )
+  SUBDIRS(src)
+ENDIF (BUILD_V2)
+
+
+#
 SUBDIRS(appli)
 SUBDIRS(bbtk)
 SUBDIRS(install)