changeset 17:2514880d4f0b

cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 26 Jun 2019 14:09:30 +0200
parents 25292488ff8f
children e7ea54d8c16c a722ca0ad867
files CMakeLists.txt Plugin/GoogleUpdater.cpp Resources/Orthanc/DownloadOrthancFramework.cmake
diffstat 3 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Jun 26 11:29:25 2019 +0200
+++ b/CMakeLists.txt	Wed Jun 26 14:09:30 2019 +0200
@@ -4,21 +4,19 @@
 
 set(GCP_PLUGIN_VERSION "mainline")
 
-# TODO - Update to 1.5.7 once available
-
 if (GCP_PLUGIN_VERSION STREQUAL "mainline")
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     set(ORTHANC_FRAMEWORK_VERSION "mainline")
   else()
     # "hg" is not available in holy-build-box => We set
-    # "ORTHANC_FRAMEWORK_SOURCE" to "web" in the build script, which
-    # forces to use a specific version (1.5.6)
-    set(ORTHANC_FRAMEWORK_VERSION "1.5.6")
+    # "ORTHANC_FRAMEWORK_SOURCE" to "web" in the BuildBot script, which
+    # forces to use a specific version (1.5.7)
+    set(ORTHANC_FRAMEWORK_VERSION "1.5.7")
   endif()
     
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.5.6")
+  set(ORTHANC_FRAMEWORK_VERSION "1.5.7")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
--- a/Plugin/GoogleUpdater.cpp	Wed Jun 26 11:29:25 2019 +0200
+++ b/Plugin/GoogleUpdater.cpp	Wed Jun 26 14:09:30 2019 +0200
@@ -91,8 +91,8 @@
     };
 
   public:
-    CurlBuilder(std::string base_url,
-                std::shared_ptr<google::cloud::storage::internal::CurlHandleFactory> factory) :
+    CurlBuilder(const std::string& base_url,
+                const std::shared_ptr<google::cloud::storage::internal::CurlHandleFactory>& factory) :
       CurlRequestBuilder(base_url, std::make_shared<HandleFactory>())
     {
     }
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Wed Jun 26 11:29:25 2019 +0200
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Wed Jun 26 14:09:30 2019 +0200
@@ -108,6 +108,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "cfc437e0687ae4bd725fd93dc1f08bc4")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.6")
         set(ORTHANC_FRAMEWORK_MD5 "3c29de1e289b5472342947168f0105c0")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.7")
+        set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3")
       endif()
     endif()
   endif()