X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=3afd95ec8398832dadeb32320f856d2cfab2e9f4;hb=6502348c86e944d957471c1e00dec8458b7b0891;hp=39523182c4dee748d155bc0d6ce40849e958de8a;hpb=c05dc420322ac9b035999a780a8e46079ef235bf;p=creaBruker.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3952318..3afd95e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,24 @@
+# ---------------------------------
+#
+# 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.6)
 
+#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
+
+# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
+IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+  CMAKE_POLICY(SET CMP0003 NEW)
+  CMAKE_POLICY(SET CMP0005 NEW)  
+  CMAKE_POLICY(SET CMP0011 NEW)
+ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+
+
 ###################################
 PROJECT(creaBruker)
 ###################################
@@ -8,11 +27,17 @@ PROJECT(creaBruker)
 # The project version
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 0)
+SET(PROJECT_BUILD_VERSION 1)
+
+SET(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_BUILD_VERSION}")
+
+#ADD_DEFINITIONS( -DPROJECT_VERSION=${PROJECT_VERSION} )
+#ADD_DEFINITIONS( -DPROJECT_VERSION_DATE=${PROJECT_VERSION_DATE} )
+
 #==================================
 
 #==================================
-# Find crea (mandatory to use macros)
+# Find crea (mandatory, to use macros)
 SET(CREA_VERBOSE_CMAKE TRUE)
 FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
@@ -27,25 +52,41 @@ CREA_PREVENT_IN_SOURCE_BUILD()
 
 #==================================
 # Libraries/tools used
+
 # Note : Set USE_CREA to ON
 #  if you need to LINK against crea
 #  (and not only use its macros)
 SET(USE_CREA      ON)
-SET(USE_GDCM      ON)
+#
+# ----------------- manual setting GDCM/GDCM2 JPR
+#
+OPTION(USE_GDCM   "Use GDCM"   ON)
 SET(USE_GDCM_VTK  ON)
-SET(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)
 SET(USE_BOOST     ON)
+
+# Note : Set USE_DOXYGEN to ON
+#  if you think you will ask, some day,
+#  for Doxygen generation
 SET(USE_DOXYGEN   ON)
+
+# Note : Set USE_LATEX to ON, USE_TTH to ON
+#  if you think you will ask, some day,
+#  for doc generation using your own latex documents
 SET(USE_LATEX     OFF)
 SET(USE_TTH       OFF)
 
 CREA_FIND_AND_USE_LIBRARIES()
 #==================================
 
+
+
 #==================================
 # Where to put executables and libs
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -55,17 +96,38 @@ MARK_AS_ADVANCED(
   EXECUTABLE_OUTPUT_PATH
   LIBRARY_OUTPUT_PATH
   )
+
 #==================================
 
   SET(LIBNAME $(PROJECT_NAME))
   INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
+
+ # // if the previous one is not enough :  (JPRx)
+ #   Add here the directories holding the .h you need
+
+ #   ${PROJECT_SOURCE_DIR}/lib/_YOUR_OWN_LIBRARY_SOURCE_DIRECTORY_
     ${PROJECT_SOURCE_DIR}/lib/src1
     )
 #==================================
+
+
+#----------------------------------------------------------------------------
+INCLUDE(${PROJECT_SOURCE_DIR}/cmake/UserRootCMakeLists.cmake)
+
+#==================================
+# Where to generate documentation
+# (desperate try; JPR)
+
+SET(BBTK_DOC_BUILD_PATH 
+     ${PROJECT_BINARY_DIR}/doc
+   )
+#==================================
+
 # Subdirs
-SUBDIRS(lib)
-SUBDIRS(appli)
-SUBDIRS(install)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(install)
 
 #==================================