X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=c256e1dd57cc6c09da1d6c727c990cf9a4583d53;hb=HEAD;hp=0ce98436f85e1ba4b5f073eec66e71e24aac7838;hpb=632ee3795c38faf6ffa11ac0d0248851eb1aa12c;p=crea.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ce9843..c256e1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,29 @@
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */                                                                         
+
+
 # ---------------------------------
 #
 # Unless you are an experimented cmake user,
@@ -9,7 +35,25 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 PROJECT(crea)
 
+#-----------------------------------------------------------------------------
+# 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)
+
 INCLUDE(Version.cmake)
+
+SET(CREA_LIBRARY_PROPERTIES ${CREA_LIBRARY_PROPERTIES}
+  VERSION "${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_VERSION}"
+  SOVERSION "${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_VERSION}"
+)
+
 SET(CREA_VERBOSE_CMAKE TRUE)
 SET(CREA_CMAKE_REL_PATH cmake)
 SET(CREA_CMAKE_DIR ${PROJECT_SOURCE_DIR}/${CREA_CMAKE_REL_PATH})
@@ -18,7 +62,6 @@ INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 
 
 CREA_PREVENT_IN_SOURCE_BUILD()
-
 SET(USE_BOOST ON)
 
 OPTION(CREA_BUILD_VTK "Build crea with vtk ?" OFF)
@@ -33,34 +76,25 @@ IF(CREA_BUILD_WX)
   SET(CREA_BUILT_WITH_WX ON)
 ENDIF(CREA_BUILD_WX)
 
-CREA_FIND_AND_USE_LIBRARIES()
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
 
+CREA_FIND_AND_USE_LIBRARIES()
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
-IF (WIN32)
-  SET(CREA_LIB_PATH bin)
-ELSE (WIN32)
-	if( NOT APPLE )
-		# check 64 bit
-		if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-			set( HAVE_64_BIT 0 )
-			SET(CREA_LIB_PATH lib)
-		else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
-			set( HAVE_64_BIT 1 )
-			SET(CREA_LIB_PATH lib64)
-		endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-	 endif( NOT APPLE )
-ENDIF(WIN32)
-
-
+SET(CREA_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
 
 MARK_AS_ADVANCED(
   CMAKE_BACKWARDS_COMPATIBILITY
-  EXECUTABLE_OUTPUT_PATH 
+  EXECUTABLE_OUTPUT_PATH
   LIBRARY_OUTPUT_PATH
   )
+  
+SET (BOOST_FILESYSTEM_VERSION 2)
+
 #-----------------------------------------------------------------------------
-# messages compilation options 
+# messages compilation options
 
 OPTION ( CREA_COMPILE_DEBUG_MESSAGES   "Compile CREA debug messages ?"   USE_DEBUG_LIB)
 OPTION ( CREA_COMPILE_ERROR_MESSAGES   "Compile CREA error messages ?"   ON)
@@ -73,10 +107,16 @@ INCLUDE(${CREA_CMAKE_DIR}/CREAResolveOptions.cmake)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
 
+#JCP UBUNTU
+INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/glib-2.0/include/)
+#JCP UBUNTU
+
+
 ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(appli)
-
+ADD_SUBDIRECTORY(lib)
 #-----------------------------------------------------------------------------
 OPTION( BUILD_SAMPLES "Build samples ?" OFF)
 IF(BUILD_SAMPLES)