X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=45c9c982b290035883ce4d6df65933a700290b9a;hb=6d762b1b6df5b3eabfabeca992572659fceb4f9f;hp=61ec579fbf886d9c426fa1eba252105e489d0d10;hpb=5e5ae5c6784b3d6cf8e2087b1662e7986cb3326c;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61ec579..45c9c98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,9 +23,11 @@ SET(CREA_VERBOSE_CMAKE TRUE)
 FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
+
 ENDIF(crea_FOUND)
 
 
+message("link directory ${GDCM_INCLUDE_DIR}")
 
 
 SET(USE_GDCM_VTK ON)
@@ -33,10 +35,27 @@ SET(USE_GDCM_VTK ON)
 SET(USE_VTK ON)
 SET(USE_ITK OFF)
 SET(USE_BOOST ON)
-SET(USE_WXWIDGETS ON)
-
-OPTION(USE_GDCM ON)
-OPTION(USE_GDCM2 OFF)
+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)
+		 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)
  MESSAGE(STATUS "GDCM LIB ....= ${GDCM_LIBRARIES}")
 IF(USE_GDCM2)
 	OPTION(USE_GDCM_ANOM "use gdcm2 anonymizer tool" OFF)
@@ -53,19 +72,22 @@ MARK_AS_ADVANCED(
   )
 
 IF(WIN32)
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
-LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+	IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
+		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+		LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+	endif()
+	IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win64)
+		LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win64)
+	endif()
 ENDIF(WIN32)
 
-
-
-
 SET(LIBNAME creaImageIO)
 	INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/src
     )
-SUBDIRS(src)
+ADD_SUBDIRECTORY(src)
 
 
 OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON)
@@ -86,8 +108,17 @@ IF (BUILD_CREA_PACS)
 ENDIF(BUILD_CREA_PACS)
 
 #
-SUBDIRS(appli)
-SUBDIRS(bbtk)
-SUBDIRS(win32)
-SUBDIRS(install)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(bbtk)
+ADD_SUBDIRECTORY(tests)
+
+IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
+	ADD_SUBDIRECTORY(win32)
+endif()
+IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+	ADD_SUBDIRECTORY(win64)
+endif()
+
+ADD_SUBDIRECTORY(install)
 
+ENABLE_TESTING()