# HG changeset patch # User Sebastien Jodogne # Date 1524147977 -7200 # Node ID 7853c9a6760580cf4003a40bcbefe697c9018f67 # Parent 54b4cab77f12982f7587ee7354dec929076c6662 fix for windows diff -r 54b4cab77f12 -r 7853c9a67605 Resources/DownloadOrthancFramework.cmake --- a/Resources/DownloadOrthancFramework.cmake Thu Apr 19 09:32:20 2018 +0200 +++ b/Resources/DownloadOrthancFramework.cmake Thu Apr 19 16:26:17 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}