X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=e7e5bdd1ccec5c55af3217470dcfcfbbeaed8a69;hb=c6ff4e54b4cbc10949278782648adbbca203fa6e;hp=ee5339e7a7c56ceeed7623aff0becb008e93b859;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee5339e..e7e5bdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,9 +41,9 @@ PROJECT(creaImageIO)
 
 #==================================
 # The project version
-SET(PROJECT_MAJOR_VERSION 0)
-SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 6)
+SET(PROJECT_MAJOR_VERSION 1)
+SET(PROJECT_MINOR_VERSION 0)
+SET(PROJECT_BUILD_VERSION 0)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 # JPR 4 mars 2011
@@ -64,7 +64,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 +111,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 +170,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)
 #==================================