X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=8c6e0394271b38291507b8ccfa10ce3193fef169;hb=6f12b657ec7bd02543d1572222df3b0c8c4f1a6e;hp=b5f2e688e88a803e5ef90aebee908c5d43d73b77;hpb=ef8ec8b5ac212509438a31e043d4a7ed0dcee432;p=creaBruker.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5f2e68..8c6e039 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@
 #
 # ---------------------------------
 
+# Test CMake version
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 #MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
@@ -36,6 +37,9 @@ SET(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT
 
 #==================================
 
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
 #==================================
 # Find crea (mandatory, to use macros)
 SET(CREA_VERBOSE_CMAKE TRUE)
@@ -50,6 +54,9 @@ ENDIF(crea_FOUND)
 CREA_PREVENT_IN_SOURCE_BUILD()
 #==================================
 
+# For boost 1.46 troubles...  // JPR.
+add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
+
 #==================================
 # Libraries/tools used
 
@@ -60,9 +67,10 @@ SET(USE_CREA      ON)
 #
 # ----------------- manual setting GDCM/GDCM2 JPR
 #
-OPTION(USE_GDCM   "Use GDCM"   OFF)
+OPTION(USE_GDCM   "Use GDCM"   ON)
 SET(USE_GDCM_VTK  ON)
-OPTION(USE_GDCM2  "Use gdcm 2.0.14 at least"   ON)
+OPTION(USE_GDCM2  "Use gdcm 2.0.14 at least"   OFF)
+
 # No interface for the moment, don't allow to add useless libraries
 SET(USE_WXWIDGETS OFF CACHE BOOL "Use wxWidgets" FORCE)
 SET(USE_KWWIDGETS OFF)
@@ -122,11 +130,10 @@ SET(BBTK_DOC_BUILD_PATH
      ${PROJECT_BINARY_DIR}/doc
    )
 #==================================
-
 # Subdirs
+
 ADD_SUBDIRECTORY(lib)
 ADD_SUBDIRECTORY(appli)
 ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(install)
-
 #==================================