Mercurial > hg > orthanc
changeset 3985:cb801e5b4411
clarifying embedded resources
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 29 May 2020 10:14:26 +0200 |
parents | 4769db115a02 |
children | df453020eaf5 |
files | Core/DicomNetworking/DicomControlUserConnection.cpp Resources/CMake/OrthancFrameworkConfiguration.cmake |
diffstat | 2 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/DicomNetworking/DicomControlUserConnection.cpp Wed May 27 16:44:36 2020 +0200 +++ b/Core/DicomNetworking/DicomControlUserConnection.cpp Fri May 29 10:14:26 2020 +0200 @@ -35,6 +35,7 @@ #include "DicomControlUserConnection.h" #include "../Compatibility.h" +#include "../DicomFormat/DicomArray.h" #include "../DicomParsing/FromDcmtkBridge.h" #include "../Logging.h" #include "../OrthancException.h"
--- a/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed May 27 16:44:36 2020 +0200 +++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake Fri May 29 10:14:26 2020 +0200 @@ -513,15 +513,6 @@ else() add_definitions(-DORTHANC_ENABLE_DCMTK_TRANSCODING=0) endif() - - if (STANDALONE_BUILD AND NOT HAS_EMBEDDED_RESOURCES) - EmbedResources( - ${DCMTK_DICTIONARIES} - ) - list(APPEND ORTHANC_DICOM_SOURCES_DEPENDENCIES - ${AUTOGENERATED_SOURCES} - ) - endif() endif() @@ -594,7 +585,24 @@ ${ORTHANC_ROOT}/Core/HttpServer/EmbeddedResourceHttpHandler.cpp ) endif() + +elseif (STANDALONE_BUILD) + # No embedded resources are provided by the external project, but + # some are required by the Orthanc framework (DCMTK and ICU) + add_definitions(-DORTHANC_HAS_EMBEDDED_RESOURCES=1) + + EmbedResources( + ${DCMTK_DICTIONARIES} + ${LIBICU_RESOURCES} + ) + + list(APPEND ORTHANC_DICOM_SOURCES_DEPENDENCIES + ${AUTOGENERATED_SOURCES} + ) + else() + # Neither the external project, nor the Orthanc framework have to + # embed external resources add_definitions(-DORTHANC_HAS_EMBEDDED_RESOURCES=0) endif()