changeset 2384:74d0953a3681

revert
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 30 Aug 2017 09:04:14 +0200
parents 741bb76634d3
children 01e1a25da9af 883387e2b379
files Resources/CMake/BoostConfiguration.cmake Resources/CMake/CivetwebConfiguration.cmake Resources/CMake/DcmtkConfiguration.cmake Resources/CMake/GoogleTestConfiguration.cmake Resources/CMake/JsonCppConfiguration.cmake Resources/CMake/LibCurlConfiguration.cmake Resources/CMake/LibIconvConfiguration.cmake Resources/CMake/LibJpegConfiguration.cmake Resources/CMake/LibP11Configuration.cmake Resources/CMake/LibPngConfiguration.cmake Resources/CMake/LuaConfiguration.cmake Resources/CMake/MongooseConfiguration.cmake Resources/CMake/OpenSslConfiguration.cmake Resources/CMake/PugixmlConfiguration.cmake Resources/CMake/SQLiteConfiguration.cmake Resources/CMake/ZlibConfiguration.cmake
diffstat 16 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/BoostConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -44,7 +44,7 @@
   set(BOOST_NAME boost_1_64_0)
   set(BOOST_BCP_SUFFIX bcpdigest-1.3.0)
   set(BOOST_MD5 "ecb266cf46adcc7f695ad12685871174")
-  set(BOOST_URL "https://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz")
+  set(BOOST_URL "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz")
   set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
 
   DownloadPackage(${BOOST_MD5} ${BOOST_URL} "${BOOST_SOURCES_DIR}")
--- a/Resources/CMake/CivetwebConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/CivetwebConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_CIVETWEB)
   set(CIVETWEB_SOURCES_DIR ${CMAKE_BINARY_DIR}/civetweb-1.9.1)
-  set(CIVETWEB_URL "https://www.orthanc-server.com/downloads/third-party/civetweb-1.9.1.tar.gz")
+  set(CIVETWEB_URL "http://www.orthanc-server.com/downloads/third-party/civetweb-1.9.1.tar.gz")
   set(CIVETWEB_MD5 "c713f7336582d1a78897971260c67c2a")
 
   DownloadPackage(${CIVETWEB_MD5} ${CIVETWEB_URL} "${CIVETWEB_SOURCES_DIR}")
--- a/Resources/CMake/DcmtkConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -7,7 +7,7 @@
     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 "https://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.0.zip")
+    SET(DCMTK_URL "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.0.zip")
     SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4")
     SET(DCMTK_PATCH_SPEED "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-speed.patch")
     SET(DCMTK_PATCH_MINGW64 "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-mingw64.patch")
@@ -15,7 +15,7 @@
     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 "https://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.2.tar.gz")
+    SET(DCMTK_URL "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.2.tar.gz")
     SET(DCMTK_MD5 "d219a4152772985191c9b89d75302d12")
 
     macro(DCMTK_UNSET)
--- a/Resources/CMake/GoogleTestConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/GoogleTestConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -26,7 +26,7 @@
 
 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST)
   set(GTEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0)
-  set(GTEST_URL "https://www.orthanc-server.com/downloads/third-party/gtest-1.7.0.zip")
+  set(GTEST_URL "http://www.orthanc-server.com/downloads/third-party/gtest-1.7.0.zip")
   set(GTEST_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7")
 
   DownloadPackage(${GTEST_MD5} ${GTEST_URL} "${GTEST_SOURCES_DIR}")
--- a/Resources/CMake/JsonCppConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/JsonCppConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_JSONCPP)
   set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.5)
-  set(JSONCPP_URL "https://www.orthanc-server.com/downloads/third-party/jsoncpp-0.10.5.tar.gz")
+  set(JSONCPP_URL "http://www.orthanc-server.com/downloads/third-party/jsoncpp-0.10.5.tar.gz")
   set(JSONCPP_MD5 "db146bac5a126ded9bd728ab7b61ed6b")
 
   DownloadPackage(${JSONCPP_MD5} ${JSONCPP_URL} "${JSONCPP_SOURCES_DIR}")
--- a/Resources/CMake/LibCurlConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/LibCurlConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL)
   SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.50.3)
-  SET(CURL_URL "https://www.orthanc-server.com/downloads/third-party/curl-7.50.3.tar.gz")
+  SET(CURL_URL "http://www.orthanc-server.com/downloads/third-party/curl-7.50.3.tar.gz")
   SET(CURL_MD5 "870e16fd88a88b52e26a4f04dfc161db")
 
   DownloadPackage(${CURL_MD5} ${CURL_URL} "${CURL_SOURCES_DIR}")
--- a/Resources/CMake/LibIconvConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/LibIconvConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -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 "https://www.orthanc-server.com/downloads/third-party/libiconv-1.15.tar.gz")
+    set(LIBICONV_URL "http://www.orthanc-server.com/downloads/third-party/libiconv-1.15.tar.gz")
     set(LIBICONV_MD5 "ace8b5f2db42f7b3b3057585e80d9808")
 
     DownloadPackage(${LIBICONV_MD5} ${LIBICONV_URL} "${LIBICONV_SOURCES_DIR}")
--- a/Resources/CMake/LibJpegConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/LibJpegConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -2,7 +2,7 @@
   set(LIBJPEG_SOURCES_DIR ${CMAKE_BINARY_DIR}/jpeg-9a)
   DownloadPackage(
     "3353992aecaee1805ef4109aadd433e7"
-    "https://www.orthanc-server.com/downloads/third-party/jpegsrc.v9a.tar.gz"
+    "http://www.orthanc-server.com/downloads/third-party/jpegsrc.v9a.tar.gz"
     "${LIBJPEG_SOURCES_DIR}")
 
   include_directories(
--- a/Resources/CMake/LibP11Configuration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/LibP11Configuration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -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 "https://www.orthanc-server.com/downloads/third-party/beid/libp11-0.4.0.tar.gz")
+  SET(LIBP11_URL "http://www.orthanc-server.com/downloads/third-party/beid/libp11-0.4.0.tar.gz")
   SET(LIBP11_MD5 "00b3e41db5be840d822bda12f3ab2ca7")
  
   if (IS_DIRECTORY "${LIBP11_SOURCES_DIR}")
--- a/Resources/CMake/LibPngConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/LibPngConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -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 "https://www.orthanc-server.com/downloads/third-party/libpng-1.5.12.tar.gz")
+  SET(LIBPNG_URL "http://www.orthanc-server.com/downloads/third-party/libpng-1.5.12.tar.gz")
   SET(LIBPNG_MD5 "8ea7f60347a306c5faf70b977fa80e28")
 
   DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}")
--- a/Resources/CMake/LuaConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/LuaConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -1,7 +1,7 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_LUA)
   SET(LUA_SOURCES_DIR ${CMAKE_BINARY_DIR}/lua-5.1.5)
   SET(LUA_MD5 "2e115fe26e435e33b0d5c022e4490567")
-  SET(LUA_URL "https://www.orthanc-server.com/downloads/third-party/lua-5.1.5.tar.gz")
+  SET(LUA_URL "http://www.orthanc-server.com/downloads/third-party/lua-5.1.5.tar.gz")
 
   DownloadPackage(${LUA_MD5} ${LUA_URL} "${LUA_SOURCES_DIR}")
 
--- a/Resources/CMake/MongooseConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/MongooseConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -11,7 +11,7 @@
     # Use Mongoose 3.1
     DownloadPackage(
       "e718fc287b4eb1bd523be3fa00942bb0"
-      "https://www.orthanc-server.com/downloads/third-party/mongoose-3.1.tgz"
+      "http://www.orthanc-server.com/downloads/third-party/mongoose-3.1.tgz"
       "${MONGOOSE_SOURCES_DIR}")
     
     add_definitions(-DMONGOOSE_USE_CALLBACKS=0)
@@ -21,7 +21,7 @@
     # Use Mongoose 3.8
     DownloadPackage(
       "7e3296295072792cdc3c633f9404e0c3"
-      "https://www.orthanc-server.com/downloads/third-party/mongoose-3.8.tgz"
+      "http://www.orthanc-server.com/downloads/third-party/mongoose-3.8.tgz"
       "${MONGOOSE_SOURCES_DIR}")
     
     add_definitions(-DMONGOOSE_USE_CALLBACKS=1)
--- a/Resources/CMake/OpenSslConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/OpenSslConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -4,7 +4,7 @@
   # not always properly handled when uncompressing on Windows.
 
   SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.2d)
-  SET(OPENSSL_URL "https://www.orthanc-server.com/downloads/third-party/openssl-1.0.2d.zip")
+  SET(OPENSSL_URL "http://www.orthanc-server.com/downloads/third-party/openssl-1.0.2d.zip")
   SET(OPENSSL_MD5 "4b2ac15fc6db17f3dadc54482d3eee85")
 
   if (IS_DIRECTORY "${OPENSSL_SOURCES_DIR}")
--- a/Resources/CMake/PugixmlConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/PugixmlConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -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 "https://www.orthanc-server.com/downloads/third-party/pugixml-1.4.tar.gz")
+  set(PUGIXML_URL "http://www.orthanc-server.com/downloads/third-party/pugixml-1.4.tar.gz")
 
   DownloadPackage(${PUGIXML_MD5} ${PUGIXML_URL} "${PUGIXML_SOURCES_DIR}")
 
--- a/Resources/CMake/SQLiteConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/SQLiteConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -17,7 +17,7 @@
 if (SQLITE_STATIC)
   SET(SQLITE_SOURCES_DIR ${CMAKE_BINARY_DIR}/sqlite-amalgamation-3071300)
   SET(SQLITE_MD5 "5fbeff9645ab035a1f580e90b279a16d")
-  SET(SQLITE_URL "https://www.orthanc-server.com/downloads/third-party/sqlite-amalgamation-3071300.zip")
+  SET(SQLITE_URL "http://www.orthanc-server.com/downloads/third-party/sqlite-amalgamation-3071300.zip")
 
   add_definitions(-DORTHANC_SQLITE_VERSION=3007013)
 
--- a/Resources/CMake/ZlibConfiguration.cmake	Wed Aug 30 08:53:18 2017 +0200
+++ b/Resources/CMake/ZlibConfiguration.cmake	Wed Aug 30 09:04:14 2017 +0200
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_ZLIB)
   SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7)
-  SET(ZLIB_URL "https://www.orthanc-server.com/downloads/third-party/zlib-1.2.7.tar.gz")
+  SET(ZLIB_URL "http://www.orthanc-server.com/downloads/third-party/zlib-1.2.7.tar.gz")
   SET(ZLIB_MD5 "60df6a37c56e7c1366cca812414f7b85")
 
   DownloadPackage(${ZLIB_MD5} ${ZLIB_URL} "${ZLIB_SOURCES_DIR}")