X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=84061b5e0f24d4d4f9e72eececeff0a38ee4d650;hb=7dc3332abdb3f12ca8a5e9e5bd902bfbef7e44dc;hp=d5f611fa64e8597fd0baa1d856b1535fdc52479e;hpb=e79fb3b2d29dd690c3f78057105b61227c9b0297;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5f611f..84061b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,5 @@
 #
 # Test CMake version
-#
-
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 
 #MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
@@ -12,23 +10,37 @@ 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(creaImageIO)
+###################################
 
+#==================================
+# The project version
 SET(PROJECT_MAJOR_VERSION 0)
 SET(PROJECT_MINOR_VERSION 2)
 SET(PROJECT_BUILD_VERSION 5)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
+#==================================
+# Find crea (mandatory, to use macros)
 FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
-
 ENDIF(crea_FOUND)
+#==================================
 
+#==================================
+# Do not allow to build inside the source tree
+CREA_PREVENT_IN_SOURCE_BUILD()
+#==================================
 
-message("link directory ${GDCM_INCLUDE_DIR}")
+message("link directory ${GDCM_INCLUDE_DIR} ?!? ")
 
+# For boost 1.46 troubles...  // JPR.
+add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
 
 SET(USE_GDCM_VTK ON)
 
@@ -53,9 +65,12 @@ IF(QT4_FOUND)
 		LINK_DIRECTORIES(${QT_DIR}/../lib)
  ENDIF(WIN32)
 ENDIF(QT4_FOUND)
-		 
-OPTION(USE_GDCM "Use gdcm 1.3" OFF)
-OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" ON)
+#
+# ----------------- 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)
@@ -107,7 +122,9 @@ IF (BUILD_CREA_PACS)
 	CREA_DEFINE(BUILD_PACS)
 ENDIF(BUILD_CREA_PACS)
 
-#
+#==================================
+# Subdirs
+
 ADD_SUBDIRECTORY(appli)
 ADD_SUBDIRECTORY(bbtk)
 ADD_SUBDIRECTORY(tests)
@@ -120,5 +137,6 @@ IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
 endif()
 
 ADD_SUBDIRECTORY(install)
+#==================================
 
 ENABLE_TESTING()