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=b1d6dfcc67011783926a78ab4cf1e69ecd326314;hpb=1d55c1cf210e95a6dc12fb8af67b2d21e48fb408;p=creaImageIO.git diff --git a/CMakeLists.txt b/CMakeLists.txt index b1d6dfc..d2c85ad 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) @@ -16,9 +41,9 @@ PROJECT(creaImageIO) #================================== # 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,7 +62,6 @@ 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) @@ -78,7 +102,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}) @@ -129,7 +152,9 @@ ENDIF(BUILD_CREA_PACS) 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) @@ -141,4 +166,6 @@ endif() ADD_SUBDIRECTORY(install) #================================== -ENABLE_TESTING() + +#EED 31/05/2011 not compiling +#ENABLE_TESTING()