X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=eb8dd3e112e0b1bcb6a6025814c7f1bee45f4ace;hb=03e0e27b85c3dc451bf9e072fe1e8afcbe5dfe8b;hp=75e82dbfedabc22d5a84e4024072ebe3426ac5cd;hpb=0d9b01fc0a92aad82fa601c36952ffb2a89d5bbb;p=crea.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75e82db..eb8dd3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,21 +1,36 @@
+# ---------------------------------
+#
+# Unless you are an experimented cmake user,
+# have a look at :
+# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
+# before starting
+# ---------------------------------
+
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 PROJECT(crea)
 
 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})
-INCLUDE(${CREA_CMAKE_DIR}/CREACMakeSettings.cmake)
+INCLUDE(${CREA_CMAKE_DIR}/CREACMakeSettings.cmake NO_POLICY_SCOPE)
 INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 
+
 CREA_PREVENT_IN_SOURCE_BUILD()
+SET(USE_BOOST ON)
 
 OPTION(CREA_BUILD_VTK "Build crea with vtk ?" OFF)
 IF(CREA_BUILD_VTK)
   SET(USE_VTK ON)
   SET(CREA_BUILT_WITH_VTK ON)
 ENDIF(CREA_BUILD_VTK)
-#SET(USE_BOOST ON)
 
 OPTION(CREA_BUILD_WX "Build crea with wxWidgets ?" OFF)
 IF(CREA_BUILD_WX)
@@ -23,26 +38,27 @@ 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)
-  SET(CREA_LIB_PATH lib)
-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 
-OPTION ( CREA_COMPILE_DEBUG_MESSAGES   "Compile CREA debug messages ?"   OFF)
+# 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)
 OPTION ( CREA_COMPILE_MESSAGES         "Compile CREA messages ?"         ON)
 OPTION ( CREA_COMPILE_WARNING_MESSAGES "Compile CREA warning messages ?" ON)
@@ -50,19 +66,18 @@ OPTION ( CREA_COMPILE_WARNING_MESSAGES "Compile CREA warning messages ?" ON)
 
 INCLUDE(${CREA_CMAKE_DIR}/CREAResolveOptions.cmake)
 
-SUBDIRS(cmake)
-SUBDIRS(src)
-SUBDIRS(appli)
-
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
 
+ADD_SUBDIRECTORY(cmake)
+ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(appli)
 #-----------------------------------------------------------------------------
 OPTION( BUILD_SAMPLES "Build samples ?" OFF)
 IF(BUILD_SAMPLES)
-  SUBDIRS(samples)
+  ADD_SUBDIRECTORY(samples)
 ENDIF(BUILD_SAMPLES)
 #-----------------------------------------------------------------------------
 
-SUBDIRS(install)
+ADD_SUBDIRECTORY(install)