Mercurial > hg > orthanc-dicomweb
changeset 723:d3bc898d8124 default tip
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 19 Aug 2025 10:30:03 +0200 |
parents | 5489bac34208 |
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 Thu Aug 14 16:38:43 2025 +0200 +++ b/Resources/Orthanc/CMake/AutoGeneratedCode.cmake Tue Aug 19 10:30:03 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 Thu Aug 14 16:38:43 2025 +0200 +++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Tue Aug 19 10:30:03 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 Thu Aug 14 16:38:43 2025 +0200 +++ b/Resources/SyncOrthancFolder.py Tue Aug 19 10:30:03 2025 +0200 @@ -19,8 +19,8 @@ ('OrthancFramework/Resources/CMake/Compiler.cmake', 'CMake'), ('OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake', 'CMake'), ('OrthancFramework/Resources/CMake/DownloadPackage.cmake', 'CMake'), + ('OrthancFramework/Resources/CMake/EmbedResources.py', 'CMake'), ('OrthancFramework/Resources/CMake/GoogleTestConfiguration.cmake', 'CMake'), - ('OrthancFramework/Resources/EmbedResources.py', 'CMake'), ('OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake', 'Toolchains'), ('OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain32.cmake', 'Toolchains'), ('OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain64.cmake', 'Toolchains'),