Mercurial > hg > orthanc
comparison Resources/DownloadOrthancFramework.cmake @ 2553:7853c9a67605
fix for windows
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 19 Apr 2018 16:26:17 +0200 |
parents | 54b4cab77f12 |
children | c211c5cb501e |
comparison
equal
deleted
inserted
replaced
2552:54b4cab77f12 | 2553:7853c9a67605 |
---|---|
215 if (DEFINED ORTHANC_FRAMEWORK_URL) | 215 if (DEFINED ORTHANC_FRAMEWORK_URL) |
216 string(REGEX REPLACE "^.*/" "" ORTHANC_FRAMEMORK_FILENAME "${ORTHANC_FRAMEWORK_URL}") | 216 string(REGEX REPLACE "^.*/" "" ORTHANC_FRAMEMORK_FILENAME "${ORTHANC_FRAMEWORK_URL}") |
217 else() | 217 else() |
218 # Default case: Download from the official Web site | 218 # Default case: Download from the official Web site |
219 set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz) | 219 set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz) |
220 #set(ORTHANC_FRAMEWORK_URL "https://www.orthanc-server.com/downloads/get.php?path=/orthanc/${ORTHANC_FRAMEMORK_FILENAME}") | 220 #set(ORTHANC_FRAMEWORK_URL "http://www.orthanc-server.com/downloads/get.php?path=/orthanc/${ORTHANC_FRAMEMORK_FILENAME}") |
221 set(ORTHANC_FRAMEWORK_URL "https://www.orthanc-server.com/downloads/third-party/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}") | 221 set(ORTHANC_FRAMEWORK_URL "http://www.orthanc-server.com/downloads/third-party/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}") |
222 endif() | 222 endif() |
223 | 223 |
224 set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}") | 224 set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}") |
225 | 225 |
226 if (NOT EXISTS "${ORTHANC_FRAMEWORK_ARCHIVE}") | 226 if (NOT EXISTS "${ORTHANC_FRAMEWORK_ARCHIVE}") |
290 | 290 |
291 if (Failure) | 291 if (Failure) |
292 message(FATAL_ERROR "Error while running the uncompression tool") | 292 message(FATAL_ERROR "Error while running the uncompression tool") |
293 endif() | 293 endif() |
294 | 294 |
295 string(REGEX REPLACE ".gz$" "" TMP "${ORTHANC_FRAMEWORK_ARCHIVE}") | 295 get_filename_component(TMP_FILENAME "${ORTHANC_FRAMEWORK_ARCHIVE}" NAME) |
296 string(REGEX REPLACE ".gz$" "" TMP_FILENAME2 "${TMP_FILENAME}") | |
296 | 297 |
297 execute_process( | 298 execute_process( |
298 COMMAND ${ORTHANC_FRAMEWORK_7ZIP} x -y ${TMP_FILENAME2} | 299 COMMAND ${ORTHANC_FRAMEWORK_7ZIP} x -y ${TMP_FILENAME2} |
299 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | 300 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
300 RESULT_VARIABLE Failure | 301 RESULT_VARIABLE Failure |