Mercurial > hg > orthanc

changeset 111:0fc3b69c0357

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
preparing for release
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 04 Oct 2012 12:45:24 +0200
parents fd7b0a3e6260
children 80ca409f232f
files NEWS Resources/CMake/BoostConfiguration.cmake
diffstat 2 files changed, 20 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Thu Oct 04 12:33:31 2012 +0200
+++ b/NEWS	Thu Oct 04 12:45:24 2012 +0200
@@ -3,6 +3,13 @@
 
 
 
+Version 0.2.2 (2012/10/40)
+==========================
+
+* Fixes to Debian packaging
+
+
+
 Version 0.2.1 (2012/09/28)
 ==========================
 
--- a/Resources/CMake/BoostConfiguration.cmake	Thu Oct 04 12:33:31 2012 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Thu Oct 04 12:45:24 2012 +0200
@@ -14,16 +14,25 @@
     message(FATAL_ERROR "Unable to locate Boost on this system")
   endif()
 
+  # Boost releases 1.44 through 1.47 supply both V2 and V3 filesystem
+  # http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v3/doc/index.htm
+  if (${Boost_VERSION} LESS 104400)
+    add_definitions(
+      -DBOOST_HAS_FILESYSTEM_V3=0
+      )
+  else()
+    add_definitions(
+      -DBOOST_HAS_FILESYSTEM_V3=1
+      -DBOOST_FILESYSTEM_VERSION=3
+      )
+  endif()
+
   #if (${Boost_VERSION} LESS 104800)
   # boost::locale is only available from 1.48.00
   #message("Too old version of Boost (${Boost_LIB_VERSION}): Building the static version")
   #  SET(BOOST_STATIC 1)
   #endif()
 
-  #add_definitions(
-  #  -DBOOST_FILESYSTEM_VERSION=1
-  #  )
-
   include_directories(${Boost_INCLUDE_DIRS})
   link_libraries(${Boost_LIBRARIES})
 endif()
@@ -95,6 +104,5 @@
 else()
   add_definitions(
     -DBOOST_HAS_LOCALE=0
-    -DBOOST_HAS_FILESYSTEM_V3=0
     )
 endif()