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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dd3eb4..4251d0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,28 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+
 #
 # Test CMake version
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
@@ -14,11 +39,24 @@ 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 0)
-SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 5)
+SET(PROJECT_MAJOR_VERSION 1)
+SET(PROJECT_MINOR_VERSION 0)
+SET(PROJECT_BUILD_VERSION 0)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 # JPR 4 mars 2011
@@ -37,10 +75,9 @@ ENDIF(crea_FOUND)
 CREA_PREVENT_IN_SOURCE_BUILD()
 #==================================
 
-message("link directory ${GDCM_INCLUDE_DIR} ?!? ")
 
 # For boost 1.46 troubles...  // JPR.
-add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
+add_definitions(-DBOOST_FILESYSTEM_VERSION=3)
 
 SET(USE_GDCM_VTK ON)
 
@@ -78,7 +115,6 @@ IF(USE_GDCM2)
 ENDIF(USE_GDCM2)
 OPTION(USE_ITK "use ITK" ON)
 CREA_FIND_AND_USE_LIBRARIES()
-message ("itk libs : ${ITK_LIBRARIES}")
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -88,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}
@@ -133,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)
 #==================================