X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=d2c85ad79d00d6a9b0c1e11e804e76c9a531d743;hb=refs%2Fheads%2Fv1.0.0;hp=6c9f95d0243a0f942c204e1d8c0c4532b8e8e0c8;hpb=12e516415f5641b9688857088f3c6474abc522c2;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c9f95d..d2c85ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,30 @@
+# ---------------------------------------------------------------------
 #
-# Test CMake version
+# 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)
 
 #MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
@@ -12,28 +35,41 @@ IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VER
   CMAKE_POLICY(SET CMP0011 NEW)
 ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
 
-
+###################################
 PROJECT(creaImageIO)
+###################################
 
-SET(PROJECT_MAJOR_VERSION 0)
-SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 5)
+#==================================
+# The project version
+SET(PROJECT_MAJOR_VERSION 1)
+SET(PROJECT_MINOR_VERSION 0)
+SET(PROJECT_BUILD_VERSION 0)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
+#==================================
+# Find crea (mandatory, to use macros)
 FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
-
 ENDIF(crea_FOUND)
+#==================================
 
+#==================================
+# Do not allow to build inside the source tree
+CREA_PREVENT_IN_SOURCE_BUILD()
+#==================================
 
-message("link directory ${GDCM_INCLUDE_DIR}")
 
+# For boost 1.46 troubles...  // JPR.
+add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
 
 SET(USE_GDCM_VTK ON)
 
 SET(USE_VTK ON)
-SET(USE_ITK OFF)
+
 SET(USE_BOOST ON)
 OPTION(USE_WXWIDGETS "Use WxWidgets GUI" ON)
 OPTION(USE_QT4 "USE QT4GUI"       OFF)
@@ -56,13 +92,15 @@ ENDIF(QT4_FOUND)
 #
 # ----------------- manual setting GDCM/GDCM2 JPR
 #		 
-OPTION(USE_GDCM "Use gdcm 1.3" OFF)
-OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" ON)
+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)
 	#TO DO TEST IF GDCM_USE_SYSTEM_OPENSSL is valid
 ENDIF(USE_GDCM2)
+OPTION(USE_ITK "use ITK" ON)
 CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -109,10 +147,14 @@ IF (BUILD_CREA_PACS)
 	CREA_DEFINE(BUILD_PACS)
 ENDIF(BUILD_CREA_PACS)
 
-#
+#==================================
+# Subdirs
+
 ADD_SUBDIRECTORY(appli)
 ADD_SUBDIRECTORY(bbtk)
-ADD_SUBDIRECTORY(tests)
+
+#EED 31/05/2011   not compiling 
+#ADD_SUBDIRECTORY(tests)
 
 IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
 	ADD_SUBDIRECTORY(win32)
@@ -122,5 +164,8 @@ IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
 endif()
 
 ADD_SUBDIRECTORY(install)
+#==================================
+
 
-ENABLE_TESTING()
+#EED 31/05/2011   not compiling 
+#ENABLE_TESTING()