X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=49b10194416fa5e6ac92e5f99790b9804b06f4ea;hb=ce7305720d117b2d1a9a933124ecc832095d09ba;hp=32fc752bd1a4e7bc5a19d9f1ee2f40a06d76583a;hpb=c15dd7f9013f1c5bb6b4f5cac3cd1c92f57333f1;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32fc752..49b1019 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)
@@ -35,9 +35,13 @@ SET(USE_ITK OFF)
 SET(USE_BOOST ON)
 SET(USE_WXWIDGETS ON)
 
-OPTION(USE_GDCM ON)
-OPTION(USE_GDCM2 OFF)
-
+OPTION(USE_GDCM "use gdcm" ON)
+OPTION(USE_GDCM2 "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})
@@ -55,23 +59,14 @@ 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)