change default GDCM to GDCM2

[creaImageIO.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24ab59edbd70799818fcc35bda8830d6fc96b863..d5f611fa64e8597fd0baa1d856b1535fdc52479e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ SET(USE_BOOST ON)
 OPTION(USE_WXWIDGETS "Use WxWidgets GUI" ON)
 OPTION(USE_QT4 "USE QT4GUI"       OFF)
 OPTION(USE_XERCES "USE Xerces if you want to use an beta version of outputModel" OFF)
+OPTION(USE_INSTALL_APP "install only useful applications" ON)
 
 IF(USE_QT4)
        IF(USE_WXWIDGETS)
@@ -53,8 +54,8 @@ IF(QT4_FOUND)
  ENDIF(WIN32)
 ENDIF(QT4_FOUND)
                 
-OPTION(USE_GDCM "Use gdcm 1.3" ON)
-OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" OFF)
+OPTION(USE_GDCM "Use gdcm 1.3" OFF)
+OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" ON)
  MESSAGE(STATUS "GDCM LIB ....= ${GDCM_LIBRARIES}")
 IF(USE_GDCM2)
        OPTION(USE_GDCM_ANOM "use gdcm2 anonymizer tool" OFF)
@@ -86,7 +87,7 @@ SET(LIBNAME creaImageIO)
     ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/src
     )
-SUBDIRS(src)
+ADD_SUBDIRECTORY(src)
 
 
 OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON)
@@ -107,17 +108,17 @@ IF (BUILD_CREA_PACS)
 ENDIF(BUILD_CREA_PACS)
 
 #
-SUBDIRS(appli)
-SUBDIRS(bbtk)
-SUBDIRS(tests)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(bbtk)
+ADD_SUBDIRECTORY(tests)
 
 IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
-       SUBDIRS(win32)
+       ADD_SUBDIRECTORY(win32)
 endif()
 IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
-       SUBDIRS(win64)
+       ADD_SUBDIRECTORY(win64)
 endif()
 
-SUBDIRS(install)
+ADD_SUBDIRECTORY(install)
 
 ENABLE_TESTING()