From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Fri, 25 Feb 2011 10:09:35 +0000 (+0000)
Subject: Avoid boost 1.46 troubles
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaImageIO.git;a=commitdiff_plain;h=27912652c23d95ec0bb5440f89896f02a9df00d6

Avoid boost 1.46 troubles
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32782cd..f0b2131 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,34 @@ 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)
 
+#==================================
+# 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)
 
@@ -110,7 +119,9 @@ IF (BUILD_CREA_PACS)
 	CREA_DEFINE(BUILD_PACS)
 ENDIF(BUILD_CREA_PACS)
 
-#
+#==================================
+# Subdirs
+
 ADD_SUBDIRECTORY(appli)
 ADD_SUBDIRECTORY(bbtk)
 ADD_SUBDIRECTORY(tests)
@@ -123,5 +134,6 @@ IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
 endif()
 
 ADD_SUBDIRECTORY(install)
+#==================================
 
 ENABLE_TESTING()