changeset 737:7384635989fc default tip

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 01 Sep 2025 12:25:23 +0200
parents 725930e24cb1
children
files Resources/Orthanc/CMake/AutoGeneratedCode.cmake Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Resources/SyncOrthancFolder.py
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Orthanc/CMake/AutoGeneratedCode.cmake	Wed Aug 13 17:00:06 2025 +0200
+++ b/Resources/Orthanc/CMake/AutoGeneratedCode.cmake	Mon Sep 01 12:25:23 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)
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp	Wed Aug 13 17:00:06 2025 +0200
+++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp	Mon Sep 01 12:25:23 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>
--- a/Resources/SyncOrthancFolder.py	Wed Aug 13 17:00:06 2025 +0200
+++ b/Resources/SyncOrthancFolder.py	Mon Sep 01 12:25:23 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'),