# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1599481080 -7200
# Node ID e48acd7bc5774401fc5ac7ff19d15c0765cc3b11
# Parent  319d41a22de4ad182ae21888f0799a3cde851db3# Parent  968eb1c78aed08050f6aee8a75d3fbc9b991ff87
merge

diff -r 968eb1c78aed -r e48acd7bc577 .hgignore
--- a/.hgignore	Mon Sep 07 14:12:49 2020 +0200
+++ b/.hgignore	Mon Sep 07 14:18:00 2020 +0200
@@ -1,1 +1,3 @@
+syntax: glob
 CMakeLists.txt.user*
+*~
diff -r 968eb1c78aed -r e48acd7bc577 Aws/CMakeLists.txt
--- a/Aws/CMakeLists.txt	Mon Sep 07 14:12:49 2020 +0200
+++ b/Aws/CMakeLists.txt	Mon Sep 07 14:18:00 2020 +0200
@@ -19,6 +19,9 @@
 
 set(ENABLE_GOOGLE_TEST ON)
 set(ORTHANC_FRAMEWORK_PLUGIN ON)
+set(ENABLE_MODULE_IMAGES OFF)
+set(ENABLE_MODULE_JOBS OFF)
+set(ENABLE_MODULE_DICOM OFF)
 
 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake)
 include(${ORTHANC_FRAMEWORK_ROOT}/../../OrthancServer/Plugins/Samples/Common/OrthancPluginsExports.cmake)
diff -r 968eb1c78aed -r e48acd7bc577 Azure/CMakeLists.txt
--- a/Azure/CMakeLists.txt	Mon Sep 07 14:12:49 2020 +0200
+++ b/Azure/CMakeLists.txt	Mon Sep 07 14:18:00 2020 +0200
@@ -17,6 +17,9 @@
 
 set(ENABLE_GOOGLE_TEST ON)
 set(ORTHANC_FRAMEWORK_PLUGIN ON)
+set(ENABLE_MODULE_IMAGES OFF)
+set(ENABLE_MODULE_JOBS OFF)
+set(ENABLE_MODULE_DICOM OFF)
 
 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake)
 include(${ORTHANC_FRAMEWORK_ROOT}/../../OrthancServer/Plugins/Samples/Common/OrthancPluginsExports.cmake)
diff -r 968eb1c78aed -r e48acd7bc577 Common/EncryptionHelpers.h
--- a/Common/EncryptionHelpers.h	Mon Sep 07 14:12:49 2020 +0200
+++ b/Common/EncryptionHelpers.h	Mon Sep 07 14:18:00 2020 +0200
@@ -100,7 +100,7 @@
 
 public:
 
-  static std::string ToHexString(const CryptoPP::byte* block, size_t size);
+  static std::string ToHexString(const byte* block, size_t size);
   static std::string ToHexString(const std::string& block);
   static std::string ToHexString(const CryptoPP::SecByteBlock& block);
   static std::string ToString(const CryptoPP::SecByteBlock& block);
diff -r 968eb1c78aed -r e48acd7bc577 Google/CMakeLists.txt
--- a/Google/CMakeLists.txt	Mon Sep 07 14:12:49 2020 +0200
+++ b/Google/CMakeLists.txt	Mon Sep 07 14:18:00 2020 +0200
@@ -17,6 +17,9 @@
 
 set(ENABLE_GOOGLE_TEST ON)
 set(ORTHANC_FRAMEWORK_PLUGIN ON)
+set(ENABLE_MODULE_IMAGES OFF)
+set(ENABLE_MODULE_JOBS OFF)
+set(ENABLE_MODULE_DICOM OFF)
 
 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake)
 include(${ORTHANC_FRAMEWORK_ROOT}/../../OrthancServer/Plugins/Samples/Common/OrthancPluginsExports.cmake)