# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1719411408 -7200
# Node ID afc642ccb99ca1f9aecb9f9b8721dbf9b34eb5af
# Parent  1fe9ed55e17f50c0fef8559bbf6c4d8c1a1903fa# Parent  70caa95a9072e298887329fd05277fabe440e62a
integration 2.4.0->mainline

diff -r 70caa95a9072 -r afc642ccb99c Aws/CMakeLists.txt
--- a/Aws/CMakeLists.txt	Wed Jun 26 16:16:24 2024 +0200
+++ b/Aws/CMakeLists.txt	Wed Jun 26 16:16:48 2024 +0200
@@ -21,7 +21,7 @@
 
 project(OrthancAwsS3Storage)
 
-set(PLUGIN_VERSION "2.4.0")
+set(PLUGIN_VERSION "mainline")
 
 if (PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
diff -r 70caa95a9072 -r afc642ccb99c Aws/README.txt
--- a/Aws/README.txt	Wed Jun 26 16:16:24 2024 +0200
+++ b/Aws/README.txt	Wed Jun 26 16:16:48 2024 +0200
@@ -4,7 +4,7 @@
 
 # mkdir Build
 # cd Build
-# cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_VCPKG_PACKAGES=OFF -G Ninja
+# cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_VCPKG_PACKAGES=OFF -DUSE_SYSTEM_ORTHANC_SDK=OFF -G Ninja
 # ninja
 
 
diff -r 70caa95a9072 -r afc642ccb99c Azure/CMakeLists.txt
--- a/Azure/CMakeLists.txt	Wed Jun 26 16:16:24 2024 +0200
+++ b/Azure/CMakeLists.txt	Wed Jun 26 16:16:48 2024 +0200
@@ -21,7 +21,7 @@
 
 project(OrthancAzureBlobStorage)
 
-set(PLUGIN_VERSION "2.4.0")
+set(PLUGIN_VERSION "mainline")
 
 if (PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
diff -r 70caa95a9072 -r afc642ccb99c Google/CMakeLists.txt
--- a/Google/CMakeLists.txt	Wed Jun 26 16:16:24 2024 +0200
+++ b/Google/CMakeLists.txt	Wed Jun 26 16:16:48 2024 +0200
@@ -21,7 +21,7 @@
 
 project(OrthancGoogleCloudStorage)
 
-set(PLUGIN_VERSION "2.4.0")
+set(PLUGIN_VERSION "mainline")
 
 if (PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")