Mercurial > hg > orthanc-databases
changeset 695:91bb3a44573f
make sure that EmbedResources.py can always be found
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 16 Jun 2025 09:32:30 +0200 |
| parents | 8ea357435c46 |
| children | 98780bd98090 |
| files | Resources/CMake/DatabasesFrameworkParameters.cmake Resources/Orthanc/CMake/DownloadOrthancFramework.cmake |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/DatabasesFrameworkParameters.cmake Mon Jun 16 08:14:22 2025 +0200 +++ b/Resources/CMake/DatabasesFrameworkParameters.cmake Mon Jun 16 09:32:30 2025 +0200 @@ -26,6 +26,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/../Orthanc/CMake/DownloadOrthancFramework.cmake) +set(EMBED_RESOURCES_PYTHON ${CMAKE_CURRENT_LIST_DIR}/../Orthanc/CMake/EmbedResources.py) + if (NOT ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake) endif()
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Mon Jun 16 08:14:22 2025 +0200 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Mon Jun 16 09:32:30 2025 +0200 @@ -517,7 +517,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Compiler.cmake) include(${CMAKE_CURRENT_LIST_DIR}/DownloadPackage.cmake) include(${CMAKE_CURRENT_LIST_DIR}/AutoGeneratedCode.cmake) - set(EMBED_RESOURCES_PYTHON ${CMAKE_CURRENT_LIST_DIR}/EmbedResources.py) if (ORTHANC_FRAMEWORK_USE_SHARED) list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix)