Mercurial > hg > orthanc-dicomweb

changeset 229:511a01452b46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration OrthancDicomWeb-0.5->mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 19 Apr 2018 16:42:45 +0200
parents 34015bae7abe (current diff) 281e340575e5 (diff)
children b3bc9cae9155
files
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Thu Apr 19 15:35:54 2018 +0200
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Thu Apr 19 16:42:45 2018 +0200
@@ -217,8 +217,8 @@
   else()
     # Default case: Download from the official Web site
     set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz)
-    #set(ORTHANC_FRAMEWORK_URL "https://www.orthanc-server.com/downloads/get.php?path=/orthanc/${ORTHANC_FRAMEMORK_FILENAME}")
-    set(ORTHANC_FRAMEWORK_URL "https://www.orthanc-server.com/downloads/third-party/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
+    #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}")
   endif()
 
   set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}")
@@ -292,7 +292,8 @@
         message(FATAL_ERROR "Error while running the uncompression tool")
       endif()
 
-      string(REGEX REPLACE ".gz$" "" TMP "${ORTHANC_FRAMEWORK_ARCHIVE}")
+      get_filename_component(TMP_FILENAME "${ORTHANC_FRAMEWORK_ARCHIVE}" NAME)
+      string(REGEX REPLACE ".gz$" "" TMP_FILENAME2 "${TMP_FILENAME}")
 
       execute_process(
         COMMAND ${ORTHANC_FRAMEWORK_7ZIP} x -y ${TMP_FILENAME2}