modifications for coherent installation

[creaImageIO.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fbdf84324bbea20a70280b1f48f9ce1620ec57c..24ab59edbd70799818fcc35bda8830d6fc96b863 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,15 +36,22 @@ 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)
 
 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)
                 
+IF(QT4_FOUND)
+ IF (WIN32)
+ MESSAGE("So ... ${QT_DIR}")
+               INCLUDE_DIRECTORIES(${QT_DIR}/../include)               
+               LINK_DIRECTORIES(${QT_DIR}/../lib)
+ ENDIF(WIN32)
+ENDIF(QT4_FOUND)
                 
 OPTION(USE_GDCM "Use gdcm 1.3" ON)
 OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" OFF)
@@ -101,6 +109,7 @@ ENDIF(BUILD_CREA_PACS)
 #
 SUBDIRS(appli)
 SUBDIRS(bbtk)
+SUBDIRS(tests)
 
 IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
        SUBDIRS(win32)
@@ -111,3 +120,4 @@ endif()
 
 SUBDIRS(install)
 
+ENABLE_TESTING()