Mercurial > hg > orthanc-webviewer

changeset 196:b83fe581f6ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 20 Apr 2018 14:23:34 +0200
parents e481ff4a86cc
children 0ef2d8b970ab
files Resources/Orthanc/DownloadOrthancFramework.cmake Resources/Orthanc/MinGWToolchain.cmake
diffstat 2 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Tue Apr 17 14:47:37 2018 +0200
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Fri Apr 20 14:23:34 2018 +0200
@@ -82,6 +82,8 @@
 
     if (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.3.1")
       set(ORTHANC_FRAMEWORK_MD5 "dac95bd6cf86fb19deaf4e612961f378")
+    elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.3.2")
+      set(ORTHANC_FRAMEWORK_MD5 "d0ccdf68e855d8224331f13774992750")
     endif()
   endif()
 endif()
@@ -206,12 +208,18 @@
 
 
 ##
-## Case of the Orthanc framework downloaded from the official Web site
+## Case of the Orthanc framework downloaded from the Web
 ##
 
 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "web")
-  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}")
+  if (DEFINED ORTHANC_FRAMEWORK_URL)
+    string(REGEX REPLACE "^.*/" "" ORTHANC_FRAMEMORK_FILENAME "${ORTHANC_FRAMEWORK_URL}")
+  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}")
+  endif()
 
   set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}")
 
@@ -220,7 +228,7 @@
       message(FATAL_ERROR "CMake is not allowed to download from Internet. Please set the ALLOW_DOWNLOADS option to ON")
     endif()
 
-    message("Downloading: ${ORTHANC_FRAMEWORK_ARCHIVE}")
+    message("Downloading: ${ORTHANC_FRAMEWORK_URL}")
 
     file(DOWNLOAD
       "${ORTHANC_FRAMEWORK_URL}" "${ORTHANC_FRAMEWORK_ARCHIVE}" 
@@ -284,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}
--- a/Resources/Orthanc/MinGWToolchain.cmake	Tue Apr 17 14:47:37 2018 +0200
+++ b/Resources/Orthanc/MinGWToolchain.cmake	Fri Apr 20 14:23:34 2018 +0200
@@ -15,3 +15,6 @@
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSTACK_SIZE_PARAM_IS_A_RESERVATION=0x10000" CACHE INTERNAL "" FORCE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTACK_SIZE_PARAM_IS_A_RESERVATION=0x10000" CACHE INTERNAL "" FORCE)