changeset 451:24a7d6cfa59e

merge
author Alain Mazy <alain@mazy.be>
date Thu, 17 Jan 2019 18:28:10 +0100
parents a04f08baba27 (current diff) bb658baeb967 (diff)
children 9a8fe40acfff
files
diffstat 4 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/CairoConfiguration.cmake	Thu Jan 17 18:27:40 2019 +0100
+++ b/Resources/CMake/CairoConfiguration.cmake	Thu Jan 17 18:28:10 2019 +0100
@@ -22,7 +22,7 @@
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_CAIRO)
   SET(CAIRO_SOURCES_DIR ${CMAKE_BINARY_DIR}/cairo-1.14.12)
-  SET(CAIRO_URL "http://www.orthanc-server.com/downloads/third-party/Stone/cairo-1.14.12.tar.xz")
+  SET(CAIRO_URL "http://orthanc.osimis.io/ThirdPartyDownloads/cairo-1.14.12.tar.xz")
   SET(CAIRO_MD5 "9f0db9dbfca0966be8acd682e636d165")
 
   DownloadPackage(${CAIRO_MD5} ${CAIRO_URL} "${CAIRO_SOURCES_DIR}")
--- a/Resources/CMake/PixmanConfiguration.cmake	Thu Jan 17 18:27:40 2019 +0100
+++ b/Resources/CMake/PixmanConfiguration.cmake	Thu Jan 17 18:28:10 2019 +0100
@@ -19,7 +19,7 @@
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_PIXMAN)
   SET(PIXMAN_SOURCES_DIR ${CMAKE_BINARY_DIR}/pixman-0.34.0)
-  SET(PIXMAN_URL "http://www.orthanc-server.com/downloads/third-party/Stone/pixman-0.34.0.tar.gz")
+  SET(PIXMAN_URL "http://orthanc.osimis.io/ThirdPartyDownloads/pixman-0.34.0.tar.gz")
   SET(PIXMAN_MD5 "e80ebae4da01e77f68744319f01d52a3")
 
   if (IS_DIRECTORY "${PIXMAN_SOURCES_DIR}")
--- a/Resources/CMake/SdlConfiguration.cmake	Thu Jan 17 18:27:40 2019 +0100
+++ b/Resources/CMake/SdlConfiguration.cmake	Thu Jan 17 18:28:10 2019 +0100
@@ -19,7 +19,7 @@
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_SDL)
   SET(SDL_SOURCES_DIR ${CMAKE_BINARY_DIR}/SDL2-2.0.4)
-  SET(SDL_URL "http://www.orthanc-server.com/downloads/third-party/Stone/SDL2-2.0.4.tar.gz")
+  SET(SDL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/SDL2-2.0.4.tar.gz")
   SET(SDL_MD5 "44fc4a023349933e7f5d7a582f7b886e")
 
   DownloadPackage(${SDL_MD5} ${SDL_URL} "${SDL_SOURCES_DIR}")
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Thu Jan 17 18:27:40 2019 +0100
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Thu Jan 17 18:28:10 2019 +0100
@@ -229,8 +229,7 @@
   else()
     # Default case: Download from the official Web site
     set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz)
-    #set(ORTHANC_FRAMEWORK_URL "http://www.orthanc-server.com/downloads/get.php?path=/orthanc/${ORTHANC_FRAMEMORK_FILENAME}")
-    set(ORTHANC_FRAMEWORK_URL "http://www.orthanc-server.com/downloads/third-party/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
+    set(ORTHANC_FRAMEWORK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
   endif()
 
   set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}")