# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1547650456 -3600
# Node ID 57478347f8463ff49106cb2e2aaa3fead6fca8a1
# Parent  5c0d3df52b05b603b091d2298c9ccc62ac0ae33b# Parent  0c2a8d5e00974c49c972e3d6ff874a5e7dcad289
integration mainline->db-changes

diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/BoostConfiguration.cmake
--- a/Resources/CMake/BoostConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/BoostConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -57,7 +57,7 @@
   set(BOOST_VERSION 1.68.0)
   set(BOOST_BCP_SUFFIX bcpdigest-1.5.0)
   set(BOOST_MD5 "5297c45ffda809b2da84223bac591abe")
-  set(BOOST_URL "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz")
+  set(BOOST_URL "http://orthanc.osimis.io/ThirdPartyDownloads/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz")
   set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
 
   if (IS_DIRECTORY "${BOOST_SOURCES_DIR}")
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/CivetwebConfiguration.cmake
--- a/Resources/CMake/CivetwebConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/CivetwebConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_CIVETWEB)
   set(CIVETWEB_SOURCES_DIR ${CMAKE_BINARY_DIR}/civetweb-1.11)
-  set(CIVETWEB_URL "http://www.orthanc-server.com/downloads/third-party/civetweb-1.11.tar.gz")
+  set(CIVETWEB_URL "http://orthanc.osimis.io/ThirdPartyDownloads/civetweb-1.11.tar.gz")
   set(CIVETWEB_MD5 "b6d2175650a27924bccb747cbe084cd4")
 
   if (IS_DIRECTORY "${CIVETWEB_SOURCES_DIR}")
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -7,13 +7,13 @@
     SET(DCMTK_VERSION_NUMBER 360)
     SET(DCMTK_PACKAGE_VERSION "3.6.0")
     SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
-    SET(DCMTK_URL "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.0.zip")
+    SET(DCMTK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/dcmtk-3.6.0.zip")
     SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4")
   else()
     SET(DCMTK_VERSION_NUMBER 362)
     SET(DCMTK_PACKAGE_VERSION "3.6.2")
     SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.2)
-    SET(DCMTK_URL "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.2.tar.gz")
+    SET(DCMTK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/dcmtk-3.6.2.tar.gz")
     SET(DCMTK_MD5 "d219a4152772985191c9b89d75302d12")
 
     macro(DCMTK_UNSET)
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/GoogleTestConfiguration.cmake
--- a/Resources/CMake/GoogleTestConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/GoogleTestConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -29,7 +29,7 @@
 
 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST)
   set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0)
-  set(GOOGLE_TEST_URL "http://www.orthanc-server.com/downloads/third-party/gtest-1.7.0.zip")
+  set(GOOGLE_TEST_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gtest-1.7.0.zip")
   set(GOOGLE_TEST_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7")
 
   DownloadPackage(${GOOGLE_TEST_MD5} ${GOOGLE_TEST_URL} "${GOOGLE_TEST_SOURCES_DIR}")
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/JsonCppConfiguration.cmake
--- a/Resources/CMake/JsonCppConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/JsonCppConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -3,12 +3,12 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_JSONCPP)
   if (USE_LEGACY_JSONCPP)
     set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.6)
-    set(JSONCPP_URL "http://www.orthanc-server.com/downloads/third-party/jsoncpp-0.10.6.tar.gz")
+    set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-0.10.6.tar.gz")
     set(JSONCPP_MD5 "13d1991d79697df8cadbc25c93e37c83")
     add_definitions(-DORTHANC_LEGACY_JSONCPP=1)
   else()
     set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.8.4)
-    set(JSONCPP_URL "http://www.orthanc-server.com/downloads/third-party/jsoncpp-1.8.4.tar.gz")
+    set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-1.8.4.tar.gz")
     set(JSONCPP_MD5 "fa47a3ab6b381869b6a5f20811198662")
     add_definitions(-DORTHANC_LEGACY_JSONCPP=0)
     set(JSONCPP_CXX11 ON)
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/LibCurlConfiguration.cmake
--- a/Resources/CMake/LibCurlConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/LibCurlConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL)
   SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.57.0)
-  SET(CURL_URL "http://www.orthanc-server.com/downloads/third-party/curl-7.57.0.tar.gz")
+  SET(CURL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/curl-7.57.0.tar.gz")
   SET(CURL_MD5 "c7aab73aaf5e883ca1d7518f93649dc2")
 
   if (IS_DIRECTORY "${CURL_SOURCES_DIR}")
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/LibIconvConfiguration.cmake
--- a/Resources/CMake/LibIconvConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/LibIconvConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -9,7 +9,7 @@
 
   if (STATIC_BUILD OR NOT USE_SYSTEM_LIBICONV)
     set(LIBICONV_SOURCES_DIR ${CMAKE_BINARY_DIR}/libiconv-1.15)
-    set(LIBICONV_URL "http://www.orthanc-server.com/downloads/third-party/libiconv-1.15.tar.gz")
+    set(LIBICONV_URL "http://orthanc.osimis.io/ThirdPartyDownloads/libiconv-1.15.tar.gz")
     set(LIBICONV_MD5 "ace8b5f2db42f7b3b3057585e80d9808")
 
     DownloadPackage(${LIBICONV_MD5} ${LIBICONV_URL} "${LIBICONV_SOURCES_DIR}")
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/LibJpegConfiguration.cmake
--- a/Resources/CMake/LibJpegConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/LibJpegConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -2,7 +2,7 @@
   set(LIBJPEG_SOURCES_DIR ${CMAKE_BINARY_DIR}/jpeg-9a)
   DownloadPackage(
     "3353992aecaee1805ef4109aadd433e7"
-    "http://www.orthanc-server.com/downloads/third-party/jpegsrc.v9a.tar.gz"
+    "http://orthanc.osimis.io/ThirdPartyDownloads/jpegsrc.v9a.tar.gz"
     "${LIBJPEG_SOURCES_DIR}")
 
   include_directories(
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/LibP11Configuration.cmake
--- a/Resources/CMake/LibP11Configuration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/LibP11Configuration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_LIBP11)
   SET(LIBP11_SOURCES_DIR ${CMAKE_BINARY_DIR}/libp11-0.4.0)
-  SET(LIBP11_URL "http://www.orthanc-server.com/downloads/third-party/beid/libp11-0.4.0.tar.gz")
+  SET(LIBP11_URL "http://orthanc.osimis.io/ThirdPartyDownloads/libp11-0.4.0.tar.gz")
   SET(LIBP11_MD5 "00b3e41db5be840d822bda12f3ab2ca7")
  
   if (IS_DIRECTORY "${LIBP11_SOURCES_DIR}")
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/LibPngConfiguration.cmake
--- a/Resources/CMake/LibPngConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/LibPngConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_LIBPNG)
   SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.5.12)
-  SET(LIBPNG_URL "http://www.orthanc-server.com/downloads/third-party/libpng-1.5.12.tar.gz")
+  SET(LIBPNG_URL "http://orthanc.osimis.io/ThirdPartyDownloads/libpng-1.5.12.tar.gz")
   SET(LIBPNG_MD5 "8ea7f60347a306c5faf70b977fa80e28")
 
   DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}")
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/LuaConfiguration.cmake
--- a/Resources/CMake/LuaConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/LuaConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -1,7 +1,7 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_LUA)
   SET(LUA_SOURCES_DIR ${CMAKE_BINARY_DIR}/lua-5.3.5)
   SET(LUA_MD5 "4f4b4f323fd3514a68e0ab3da8ce3455")
-  SET(LUA_URL "http://www.orthanc-server.com/downloads/third-party/lua-5.3.5.tar.gz")
+  SET(LUA_URL "http://orthanc.osimis.io/ThirdPartyDownloads/lua-5.3.5.tar.gz")
 
   DownloadPackage(${LUA_MD5} ${LUA_URL} "${LUA_SOURCES_DIR}")
 
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/MongooseConfiguration.cmake
--- a/Resources/CMake/MongooseConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/MongooseConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -11,7 +11,7 @@
     # Use Mongoose 3.1
     DownloadPackage(
       "e718fc287b4eb1bd523be3fa00942bb0"
-      "http://www.orthanc-server.com/downloads/third-party/mongoose-3.1.tgz"
+      "http://orthanc.osimis.io/ThirdPartyDownloads/mongoose-3.1.tgz"
       "${MONGOOSE_SOURCES_DIR}")
     
     add_definitions(-DMONGOOSE_USE_CALLBACKS=0)
@@ -21,7 +21,7 @@
     # Use Mongoose 3.8
     DownloadPackage(
       "7e3296295072792cdc3c633f9404e0c3"
-      "http://www.orthanc-server.com/downloads/third-party/mongoose-3.8.tgz"
+      "http://orthanc.osimis.io/ThirdPartyDownloads/mongoose-3.8.tgz"
       "${MONGOOSE_SOURCES_DIR}")
     
     add_definitions(-DMONGOOSE_USE_CALLBACKS=1)
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/OpenSslConfiguration.cmake
--- a/Resources/CMake/OpenSslConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/OpenSslConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL)
   SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.2o)
-  SET(OPENSSL_URL "http://www.orthanc-server.com/downloads/third-party/openssl-1.0.2o.tar.gz")
+  SET(OPENSSL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/openssl-1.0.2o.tar.gz")
   SET(OPENSSL_MD5 "44279b8557c3247cbe324e2322ecd114")
 
   if (IS_DIRECTORY "${OPENSSL_SOURCES_DIR}")
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/PugixmlConfiguration.cmake
--- a/Resources/CMake/PugixmlConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/PugixmlConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -1,7 +1,7 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_PUGIXML)
   set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.4)
   set(PUGIXML_MD5 "7c56c91cfe3ecdee248a8e4892ef5781")
-  set(PUGIXML_URL "http://www.orthanc-server.com/downloads/third-party/pugixml-1.4.tar.gz")
+  set(PUGIXML_URL "http://orthanc.osimis.io/ThirdPartyDownloads/pugixml-1.4.tar.gz")
 
   DownloadPackage(${PUGIXML_MD5} ${PUGIXML_URL} "${PUGIXML_SOURCES_DIR}")
 
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/SQLiteConfiguration.cmake
--- a/Resources/CMake/SQLiteConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/SQLiteConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -17,7 +17,7 @@
 if (SQLITE_STATIC)
   SET(SQLITE_SOURCES_DIR ${CMAKE_BINARY_DIR}/sqlite-amalgamation-3210000)
   SET(SQLITE_MD5 "fe330e88d81e77e1e61554a370ae5001")
-  SET(SQLITE_URL "http://www.orthanc-server.com/downloads/third-party/sqlite-amalgamation-3210000.zip")
+  SET(SQLITE_URL "http://orthanc.osimis.io/ThirdPartyDownloads/sqlite-amalgamation-3210000.zip")
 
   add_definitions(-DORTHANC_SQLITE_VERSION=3021000)
 
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/UuidConfiguration.cmake
--- a/Resources/CMake/UuidConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/UuidConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -2,7 +2,7 @@
 
   if (STATIC_BUILD OR NOT USE_SYSTEM_UUID)
     SET(E2FSPROGS_SOURCES_DIR ${CMAKE_BINARY_DIR}/e2fsprogs-1.43.8)
-    SET(E2FSPROGS_URL "http://www.orthanc-server.com/downloads/third-party/e2fsprogs-1.43.8.tar.gz")
+    SET(E2FSPROGS_URL "http://orthanc.osimis.io/ThirdPartyDownloads/e2fsprogs-1.43.8.tar.gz")
     SET(E2FSPROGS_MD5 "670b7a74a8ead5333acf21b9afc92b3c")
 
     if (IS_DIRECTORY "${E2FSPROGS_SOURCES_DIR}")
diff -r 5c0d3df52b05 -r 57478347f846 Resources/CMake/ZlibConfiguration.cmake
--- a/Resources/CMake/ZlibConfiguration.cmake	Wed Jan 16 14:14:48 2019 +0100
+++ b/Resources/CMake/ZlibConfiguration.cmake	Wed Jan 16 15:54:16 2019 +0100
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_ZLIB)
   SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.11)
-  SET(ZLIB_URL "http://www.orthanc-server.com/downloads/third-party/zlib-1.2.11.tar.gz")
+  SET(ZLIB_URL "http://orthanc.osimis.io/ThirdPartyDownloads/zlib-1.2.11.tar.gz")
   SET(ZLIB_MD5 "1c9f62f0778697a09d36121ead88e08e")
 
   DownloadPackage(${ZLIB_MD5} ${ZLIB_URL} "${ZLIB_SOURCES_DIR}")