Relevant Ctests for creaImageIO

[creaImageIO.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0432a40930a23958fa814907d36f44d5f9ce9f94..b0ead9604ff17b3061ce006b9aaa24e001740526 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,7 @@ SET(CREA_VERBOSE_CMAKE TRUE)
 FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
+
 ENDIF(crea_FOUND)
 
 
@@ -44,8 +45,8 @@ IF(USE_QT4)
 ENDIF(USE_QT4)
                 
                 
-OPTION(USE_GDCM ON)
-OPTION(USE_GDCM2 OFF)
+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)
@@ -62,13 +63,16 @@ 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}
@@ -97,6 +101,15 @@ ENDIF(BUILD_CREA_PACS)
 #
 SUBDIRS(appli)
 SUBDIRS(bbtk)
-SUBDIRS(win32)
+SUBDIRS(tests)
+
+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)
 
+ENABLE_TESTING()