X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=4251d0a5f6b3f32b04aa12b52dac153826db3b15;hb=HEAD;hp=d2c85ad79d00d6a9b0c1e11e804e76c9a531d743;hpb=d70952152a4f1faf5ef532500b22c5d1f4067905;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2c85ad..4251d0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,19 @@ ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_
 PROJECT(creaImageIO)
 ###################################
 
+#-----------------------------------------------------------------------------
+# Configure Dart testing support.  This should be done before any
+# MESSAGE(FATAL_ERROR ...) commands are invoked.
+IF(INCLUDE_CTEST)
+  INCLUDE(CTest)
+  ENABLE_TESTING()
+ENDIF(INCLUDE_CTEST)
+IF(BUILD_TESTING)
+  SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
+  MARK_AS_ADVANCED(BUILDNAME)
+ENDIF(BUILD_TESTING)
+#-----------------------------------------------------------------------------
+
 #==================================
 # The project version
 SET(PROJECT_MAJOR_VERSION 1)
@@ -64,7 +77,7 @@ CREA_PREVENT_IN_SOURCE_BUILD()
 
 
 # For boost 1.46 troubles...  // JPR.
-add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
+add_definitions(-DBOOST_FILESYSTEM_VERSION=3)
 
 SET(USE_GDCM_VTK ON)
 
@@ -111,17 +124,31 @@ MARK_AS_ADVANCED(
   LIBRARY_OUTPUT_PATH
   )
 
+##EED 04juin203
+##EED IF(WIN32)
+##EED 	IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
+##EED 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+##EED 		LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+##EED 	endif()
+##EED 	IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+##EED 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win64)
+##EED 		LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win64)
+##EED 	endif()
+##EED ENDIF(WIN32)
+
+##EED SQLite
+##EED  mechanisme FIND_PACKAGE(SQLite)   missing ...
 IF(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()
+   set (SQLITE_DIR $ENV{SQLITE_DIR})
+   IF(DEFINED SQLITE_DIR)
+     INCLUDE_DIRECTORIES(${SQLITE_DIR}/include)
+     LINK_DIRECTORIES(${SQLITE_DIR}/lib)
+   ELSE()
+      MESSAGE(FATAL_ERROR  "System variable SQLITE_DIR not defined.")
+   ENDIF()
 ENDIF(WIN32)
 
+
 SET(LIBNAME creaImageIO)
 	INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
@@ -156,12 +183,13 @@ ADD_SUBDIRECTORY(bbtk)
 #EED 31/05/2011   not compiling 
 #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()
+##EED 04juin203
+##EED IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
+##EED 	ADD_SUBDIRECTORY(win32)
+##EED endif()
+##EED IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+##EED 	ADD_SUBDIRECTORY(win64)
+##EED endif()
 
 ADD_SUBDIRECTORY(install)
 #==================================