Replace deprecated SUBDIRS by ADD_SUBDIRECTORY

[creaImageIO.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fbdf84324bbea20a70280b1f48f9ce1620ec57c..6c9f95d0243a0f942c204e1d8c0c4532b8e8e0c8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ IF (crea_FOUND)
 ENDIF(crea_FOUND)
 
 
+message("link directory ${GDCM_INCLUDE_DIR}")
 
 
 SET(USE_GDCM_VTK ON)
@@ -35,18 +36,28 @@ SET(USE_VTK ON)
 SET(USE_ITK OFF)
 SET(USE_BOOST ON)
 OPTION(USE_WXWIDGETS "Use WxWidgets GUI" ON)
-OPTION(USE_QT4 "USE WxWidgets GUI"       OFF)
+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)
-                MESSAGE(STATUS "CANNOT USE QT WXWIDGETS IN SAME TIME")
+                MESSAGE(ERROR "CANNOT USE QT WXWIDGETS IN SAME TIME")
        ENDIF(USE_WXWIDGETS)
 ENDIF(USE_QT4)
                 
-                
-OPTION(USE_GDCM "Use gdcm 1.3" ON)
-OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" OFF)
+IF(QT4_FOUND)
+ IF (WIN32)
+ MESSAGE("So ... ${QT_DIR}")
+               INCLUDE_DIRECTORIES(${QT_DIR}/../include)               
+               LINK_DIRECTORIES(${QT_DIR}/../lib)
+ ENDIF(WIN32)
+ENDIF(QT4_FOUND)
+#
+# ----------------- manual setting GDCM/GDCM2 JPR
+#               
+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)
@@ -78,7 +89,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)
@@ -99,15 +110,17 @@ IF (BUILD_CREA_PACS)
 ENDIF(BUILD_CREA_PACS)
 
 #
-SUBDIRS(appli)
-SUBDIRS(bbtk)
+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()