Mercurial > hg > orthanc-object-storage
changeset 23:e48acd7bc577
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 07 Sep 2020 14:18:00 +0200 |
| parents | 319d41a22de4 (diff) 968eb1c78aed (current diff) |
| children | 84c4ca822a13 |
| files | |
| diffstat | 5 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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* +*~
--- 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)
--- 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)
--- 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);
--- 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)