*** empty log message ***

[creaBruker.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25ce48e8ffa6cf348e8553c7cce5a042b77cb10d..8c6e0394271b38291507b8ccfa10ce3193fef169 100644 (file)
--- 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 )
@@ -18,6 +19,7 @@ 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(creaBruker)
 ###################################
@@ -35,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)
@@ -49,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
 
@@ -56,10 +64,15 @@ CREA_PREVENT_IN_SOURCE_BUILD()
 #  if you need to LINK against crea
 #  (and not only use its macros)
 SET(USE_CREA      ON)
-OPTION(USE_GDCM      ON)
+#
+# ----------------- manual setting GDCM/GDCM2 JPR
+#
+OPTION(USE_GDCM   "Use GDCM"   ON)
 SET(USE_GDCM_VTK  ON)
-OPTION(USE_GDCM2     OFF)
-SET(USE_WXWIDGETS OFF)
+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)
 SET(USE_VTK       OFF)
 SET(USE_ITK       OFF)
@@ -79,6 +92,8 @@ SET(USE_TTH       OFF)
 CREA_FIND_AND_USE_LIBRARIES()
 #==================================
 
+
+
 #==================================
 # Where to put executables and libs
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -115,11 +130,10 @@ SET(BBTK_DOC_BUILD_PATH
      ${PROJECT_BINARY_DIR}/doc
    )
 #==================================
-
 # Subdirs
-SUBDIRS(lib)
-SUBDIRS(appli)
-SUBDIRS(doc)
-SUBDIRS(install)
 
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(install)
 #==================================