# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1758112880 -7200
# Node ID 696f2dd60f4d1498196ed432b162cffa3c22069d
# Parent  5875be0338b078e01f4a73684da3a2ffc9b5cff3# Parent  7384635989fc99e762766a27737f3bc797eadbd7
merge

diff -r 5875be0338b0 -r 696f2dd60f4d Resources/Orthanc/CMake/AutoGeneratedCode.cmake
--- a/Resources/Orthanc/CMake/AutoGeneratedCode.cmake	Wed Sep 17 14:40:52 2025 +0200
+++ b/Resources/Orthanc/CMake/AutoGeneratedCode.cmake	Wed Sep 17 14:41:20 2025 +0200
@@ -20,7 +20,7 @@
 # <http://www.gnu.org/licenses/>.
 
 
-set(EMBED_RESOURCES_PYTHON "${CMAKE_CURRENT_LIST_DIR}/../EmbedResources.py"
+set(EMBED_RESOURCES_PYTHON "${CMAKE_CURRENT_LIST_DIR}/EmbedResources.py"
   CACHE INTERNAL "Path to the EmbedResources.py script from Orthanc")
 set(AUTOGENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/AUTOGENERATED")
 set(AUTOGENERATED_SOURCES)
diff -r 5875be0338b0 -r 696f2dd60f4d Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp	Wed Sep 17 14:40:52 2025 +0200
+++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp	Wed Sep 17 14:41:20 2025 +0200
@@ -23,6 +23,7 @@
 
 #include "OrthancPluginCppWrapper.h"
 
+#include <cassert>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/move/unique_ptr.hpp>
 #include <boost/thread.hpp>
diff -r 5875be0338b0 -r 696f2dd60f4d Resources/SyncOrthancFolder.py
--- a/Resources/SyncOrthancFolder.py	Wed Sep 17 14:40:52 2025 +0200
+++ b/Resources/SyncOrthancFolder.py	Wed Sep 17 14:41:20 2025 +0200
@@ -26,10 +26,10 @@
     ('default', 'OrthancFramework/Resources/CMake/Compiler.cmake', 'CMake'),
     ('default', 'OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake', 'CMake'),
     ('default', 'OrthancFramework/Resources/CMake/DownloadPackage.cmake', 'CMake'),
+    ('default', 'OrthancFramework/Resources/CMake/EmbedResources.py', 'CMake'),
     ('default', 'OrthancFramework/Resources/CMake/GoogleTestConfiguration.cmake', 'CMake'),
     ('default', 'OrthancFramework/Resources/CMake/OpenSslConfiguration.cmake', 'CMake'),
     ('default', 'OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake', 'CMake'),
-    ('default', 'OrthancFramework/Resources/EmbedResources.py', 'CMake'),
     ('default', 'OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake', 'Toolchains'),
     ('default', 'OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain32.cmake', 'Toolchains'),
     ('default', 'OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain64.cmake', 'Toolchains'),