Mercurial > hg > orthanc-object-storage

changeset 36:b649aebfcc61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 04 Jan 2021 17:14:18 +0100
parents 8a7a5defd5d0 (diff) 7ddd840563c9 (current diff)
children f55b2afdf53d
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Aws/CMakeLists.txt	Tue Nov 10 14:14:24 2020 +0100
+++ b/Aws/CMakeLists.txt	Mon Jan 04 17:14:18 2021 +0100
@@ -9,7 +9,7 @@
 include(CheckIncludeFileCXX)
 
 set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source")
-set(ORTHANC_FRAMEWORK_VERSION "1.7.3" CACHE STRING "orthanc framework version")
+set(ORTHANC_FRAMEWORK_VERSION "1.8.2" CACHE STRING "orthanc framework version")
 set(USE_VCPKG_PACKAGES ON CACHE BOOL "Use vcpkg to link against crypto++ and AWS SDK")
 set(STATIC_AWS_CLIENT ON CACHE BOOL "Statically link against AWS client library (only if USE_VCPKG_PACKAGES=OFF)")
 set(ALLOW_DOWNLOADS ON)
--- a/Common/StoragePlugin.cpp	Tue Nov 10 14:14:24 2020 +0100
+++ b/Common/StoragePlugin.cpp	Mon Jan 04 17:14:18 2021 +0100
@@ -39,6 +39,8 @@
 
 #include "../Common/EncryptionHelpers.h"
 #include "../Common/EncryptionConfigurator.h"
+
+#include <Logging.h>
 #include <SystemToolbox.h>
 
 static std::unique_ptr<IStoragePlugin> plugin;