changes fox X64 compilation

[creaImageIO.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d592badc6df1926d79fc6a965e5fe97328df9ea..6d6e6d2b9742b369f4db62ebe058eb5becd6e3ed 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,23 +17,41 @@ 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)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
+
 ENDIF(crea_FOUND)
 
-SET(USE_GDCM ON)
-#SET(USE_GDCM2 ON)
+
+
+
 SET(USE_GDCM_VTK ON)
 
 SET(USE_VTK ON)
 SET(USE_ITK OFF)
 SET(USE_BOOST ON)
-SET(USE_WXWIDGETS ON)
-
+OPTION(USE_WXWIDGETS "Use WxWidgets GUI" ON)
+OPTION(USE_QT4 "USE WxWidgets GUI"       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")
+       ENDIF(USE_WXWIDGETS)
+ENDIF(USE_QT4)
+                
+                
+OPTION(USE_GDCM ON)
+OPTION(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})
@@ -45,28 +63,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)
 
-
-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)
@@ -89,5 +101,13 @@ ENDIF(BUILD_CREA_PACS)
 #
 SUBDIRS(appli)
 SUBDIRS(bbtk)
-SUBDIRS(win32)
+
+IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
+       SUBDIRS(win32)
+endif()
+IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+       SUBDIRS(win64)
+endif()
+
 SUBDIRS(install)
+