From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Wed, 5 Jun 2013 14:25:40 +0000 (+0200)
Subject: 2018 	Bug		Take out the SQLite(dll lib h) from source and put it in creaThirdPartyLib... 
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3ca0b85c4c2a31281916c8b45a81742e0f5d818c;p=creaImageIO.git

2018 	Bug		Take out the SQLite(dll lib h) from source and put it in creaThirdPartyLibrary mechanism
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b46d8d..e7e5bdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
 #==================================