Mercurial > hg > orthanc-databases
changeset 739:696f2dd60f4d default tip
merge
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Wed, 17 Sep 2025 14:41:20 +0200 |
| parents | 5875be0338b0 (current diff) 7384635989fc (diff) |
| children | |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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>
--- 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'),