X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=61ec579fbf886d9c426fa1eba252105e489d0d10;hb=517be64c97dd4af922cda7cd182a55cf56d6ac41;hp=2d592badc6df1926d79fc6a965e5fe97328df9ea;hpb=ffae03bed057d81c2600b145f8974fb7d8f5753d;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d592ba..61ec579 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ PROJECT(creaImageIO)
 
 SET(PROJECT_MAJOR_VERSION 0)
 SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 3)
+SET(PROJECT_BUILD_VERSION 5)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -25,8 +25,9 @@ IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
-SET(USE_GDCM ON)
-#SET(USE_GDCM2 ON)
+
+
+
 SET(USE_GDCM_VTK ON)
 
 SET(USE_VTK ON)
@@ -34,6 +35,13 @@ SET(USE_ITK OFF)
 SET(USE_BOOST ON)
 SET(USE_WXWIDGETS ON)
 
+OPTION(USE_GDCM ON)
+OPTION(USE_GDCM2 OFF)
+ MESSAGE(STATUS "GDCM LIB ....= ${GDCM_LIBRARIES}")
+IF(USE_GDCM2)
+	OPTION(USE_GDCM_ANOM "use gdcm2 anonymizer tool" OFF)
+	#TO DO TEST IF GDCM_USE_SYSTEM_OPENSSL is valid
+ENDIF(USE_GDCM2)
 CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -50,23 +58,14 @@ LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 ENDIF(WIN32)
 
 
-OPTION(BUILD_V2 "Build Version 2 ?" ON) 
 
-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(
+
+SET(LIBNAME creaImageIO)
+	INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/src
     )
-  SUBDIRS(src)
-ENDIF (BUILD_V2)
+SUBDIRS(src)
 
 
 OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON)
@@ -91,3 +90,4 @@ SUBDIRS(appli)
 SUBDIRS(bbtk)
 SUBDIRS(win32)
 SUBDIRS(install)
+