Mercurial > hg > orthanc

changeset 550:210c96710592

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch to boost 1.54.0
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 17 Sep 2013 10:13:24 +0200
parents 0fc8ef464cfb
children 2699ccdcce20
files NEWS Resources/CMake/BoostConfiguration.cmake UnitTests/Versions.cpp
diffstat 3 files changed, 22 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Mon Sep 16 14:50:07 2013 +0200
+++ b/NEWS	Tue Sep 17 10:13:24 2013 +0200
@@ -1,6 +1,8 @@
 Pending changes in the mainline
 ===============================
 
+* Switch to Boost 1.54.0 (cf. issue #9)
+
 
 Version 0.6.1 (2013/09/16)
 ==========================
--- a/Resources/CMake/BoostConfiguration.cmake	Mon Sep 16 14:50:07 2013 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Tue Sep 17 10:13:24 2013 +0200
@@ -39,14 +39,25 @@
 
 
 if (BOOST_STATIC)
-  SET(BOOST_NAME boost_1_49_0)
+  if (0)
+    # Parameters for Boost 1.49.0
+    SET(BOOST_NAME boost_1_49_0)
+    SET(BOOST_MD5 "e0defc8c818e4f1c5bbb29d0292b76ca")
+    SET(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/v3/src")
+  else()
+    # Parameters for Boost 1.54.0
+    SET(BOOST_NAME boost_1_54_0)
+    SET(BOOST_MD5 "efbfbff5a85a9330951f243d0a46e4b9")
+    SET(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src")
+  endif()
+  
   SET(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
   DownloadPackage(
-    "e0defc8c818e4f1c5bbb29d0292b76ca"
+    "${BOOST_MD5}"
     "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}.tar.gz"
     "${BOOST_SOURCES_DIR}" "${BOOST_PRELOADED}" 
     # Only uncompress the Boost modules we need
-    "${BOOST_NAME}/boost ${BOOST_NAME}/libs/thread/src ${BOOST_NAME}/libs/system/src ${BOOST_NAME}/libs/filesystem/v3/src ${BOOST_NAME}/libs/locale/src ${BOOST_NAME}/libs/date_time/src"
+    "${BOOST_NAME}/boost ${BOOST_NAME}/libs/thread/src ${BOOST_NAME}/libs/system/src ${BOOST_NAME}/libs/locale/src ${BOOST_NAME}/libs/date_time/src ${BOOST_FILESYSTEM_SOURCES_DIR}"
     )
 
   set(BOOST_SOURCES)
@@ -68,7 +79,7 @@
       ${BOOST_SOURCES_DIR}/libs/thread/src/win32/tss_dll.cpp
       ${BOOST_SOURCES_DIR}/libs/thread/src/win32/thread.cpp
       ${BOOST_SOURCES_DIR}/libs/thread/src/win32/tss_pe.cpp
-      ${BOOST_SOURCES_DIR}/libs/filesystem/v3/src/windows_file_codecvt.cpp
+      ${BOOST_FILESYSTEM_SOURCES_DIR}/windows_file_codecvt.cpp
       )
     add_definitions(
       -DBOOST_LOCALE_WITH_WCONV=1
@@ -79,10 +90,10 @@
 
   list(APPEND BOOST_SOURCES
     ${BOOST_SOURCES_DIR}/libs/date_time/src/gregorian/greg_month.cpp
-    ${BOOST_SOURCES_DIR}/libs/filesystem/v3/src/codecvt_error_category.cpp
-    ${BOOST_SOURCES_DIR}/libs/filesystem/v3/src/operations.cpp
-    ${BOOST_SOURCES_DIR}/libs/filesystem/v3/src/path.cpp
-    ${BOOST_SOURCES_DIR}/libs/filesystem/v3/src/path_traits.cpp
+    ${BOOST_FILESYSTEM_SOURCES_DIR}/codecvt_error_category.cpp
+    ${BOOST_FILESYSTEM_SOURCES_DIR}/operations.cpp
+    ${BOOST_FILESYSTEM_SOURCES_DIR}/path.cpp
+    ${BOOST_FILESYSTEM_SOURCES_DIR}/path_traits.cpp
     ${BOOST_SOURCES_DIR}/libs/locale/src/encoding/codepage.cpp
     ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp
     )
--- a/UnitTests/Versions.cpp	Mon Sep 16 14:50:07 2013 +0200
+++ b/UnitTests/Versions.cpp	Tue Sep 17 10:13:24 2013 +0200
@@ -57,7 +57,7 @@
 
 TEST(Versions, BoostStatic)
 {
-  ASSERT_STREQ("1_49", BOOST_LIB_VERSION);
+  ASSERT_STREQ("1_54", BOOST_LIB_VERSION);
 }
 
 TEST(Versions, CurlStatic)