# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1379420448 -7200
# Node ID 938d8461cf8f7ef0ce25526bf1389e740eeda428
# Parent  2699ccdcce205adfb5916a6aecf3037c54702ea0
revert to boost 1.54.0, use ZIP instead of TGZ because of bad directory in package

diff -r 2699ccdcce20 -r 938d8461cf8f NEWS
--- a/NEWS	Tue Sep 17 14:13:04 2013 +0200
+++ b/NEWS	Tue Sep 17 14:20:48 2013 +0200
@@ -1,7 +1,7 @@
 Pending changes in the mainline
 ===============================
 
-* Switch to Boost 1.53.0 (cf. issue #9)
+* Switch to Boost 1.54.0 (cf. issue #9)
 
 
 Version 0.6.1 (2013/09/16)
diff -r 2699ccdcce20 -r 938d8461cf8f Resources/CMake/BoostConfiguration.cmake
--- a/Resources/CMake/BoostConfiguration.cmake	Tue Sep 17 14:13:04 2013 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Tue Sep 17 14:20:48 2013 +0200
@@ -39,25 +39,18 @@
 
 
 if (BOOST_STATIC)
-  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.53.0
-    SET(BOOST_NAME boost_1_53_0)
-    SET(BOOST_MD5 "57a9e2047c0f511c4dfcf00eb5eb2fbb")
-    SET(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src")
-  endif()
+  # Parameters for Boost 1.54.0
+  SET(BOOST_NAME boost_1_54_0)
+  SET(BOOST_MD5 "78a35834c45220a6164310e280abe675")
+  SET(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src")
   
   SET(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
   DownloadPackage(
     "${BOOST_MD5}"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}.tar.gz"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}.zip"
     "${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/locale/src ${BOOST_NAME}/libs/date_time/src ${BOOST_FILESYSTEM_SOURCES_DIR}"
+    "${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)
diff -r 2699ccdcce20 -r 938d8461cf8f UnitTests/Versions.cpp
--- a/UnitTests/Versions.cpp	Tue Sep 17 14:13:04 2013 +0200
+++ b/UnitTests/Versions.cpp	Tue Sep 17 14:20:48 2013 +0200
@@ -57,7 +57,7 @@
 
 TEST(Versions, BoostStatic)
 {
-  ASSERT_STREQ("1_53", BOOST_LIB_VERSION);
+  ASSERT_STREQ("1_54", BOOST_LIB_VERSION);
 }
 
 TEST(Versions, CurlStatic)