X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=2b11de5d57e4b0849f5a62d29250b3bf4ebee33a;hb=7851772d9bc5f7357a20ac34159825ae01b04be9;hp=895eb29a4aabc0ec343c9d4155ccd0a882faa2f8;hpb=e746553dde41260204aae07b809f484544de10b9;p=bbtk.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 895eb29..2b11de5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,41 +1,57 @@
-#
-# Test CMake version
-#
+#-----------------------------------------------------------------------------
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-#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)
-ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+#-----------------------------------------------------------------------------
 
+     if(COMMAND cmake_policy)
+       cmake_policy(SET CMP0003 NEW)
+       cmake_policy(SET CMP0005 NEW)
+       cmake_policy(SET CMP0011 NEW)             
+     endif(COMMAND cmake_policy)
 
 #-----------------------------------------------------------------------------
-PROJECT(BBTK) 
+PROJECT(bbtk) 
 #-----------------------------------------------------------------------------
 
-
 #-----------------------------------------------------------------------------
 # Set global configuration of the toolkit
-INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake)
+INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake NO_POLICY_SCOPE )
 #-----------------------------------------------------------------------------
 
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
+#
+# ----------------- manual setting GDCM/GDCM2 JPR
+#
+OPTION(USE_GDCM "Use gdcm 1.3" ON)
+OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" OFF)
+ MESSAGE(STATUS "GDCM LIB ....= ${GDCM_LIBRARIES}")
+IF(USE_GDCM2)
+	#OPTION(USE_GDCM_ANOM "use gdcm2 anonymizer tool" OFF)
+	#TO DO TEST IF GDCM_USE_SYSTEM_OPENSSL is valid
+ENDIF(USE_GDCM2)
+
 #-----------------------------------------------------------------------------
 # The toolkit kernel (bbtk lib; appli : bbi, bbfy; docs; ...)
-SUBDIRS(kernel)
+ADD_SUBDIRECTORY(kernel)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # The "core" packages 
-SUBDIRS(packages)
+ADD_SUBDIRECTORY(packages)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # The samples
-#OPTION(BUILD_BBTK_SAMPLES "Build bbtk samples" OFF)
-#IF(BUILD_BBTK_SAMPLES)
-#  SUBDIRS(samples)
-#ENDIF(BUILD_BBTK_SAMPLES)
+
+# WARNING
+# Install the creaTools first
+# then build the 'samples' as a separate project
+
+# OPTION(BUILD_BBTK_SAMPLES "Build bbtk samples" OFF)
+# IF(BUILD_BBTK_SAMPLES)
+#   ADD_SUBDIRECTORY(samples)
+# ENDIF(BUILD_BBTK_SAMPLES)
+
 #-----------------------------------------------------------------------------