# HG changeset patch # User Sebastien Jodogne # Date 1530715799 -7200 # Node ID 86ccff58f3445e62fd12c7027de46d9c129ddc19 # Parent 4f0f8026700cc40c5710edec50b88e5539c538c0 fix build if dcmtk is enabled diff -r 4f0f8026700c -r 86ccff58f344 Resources/CMake/OrthancStoneConfiguration.cmake --- a/Resources/CMake/OrthancStoneConfiguration.cmake Fri Jun 08 16:18:45 2018 +0200 +++ b/Resources/CMake/OrthancStoneConfiguration.cmake Wed Jul 04 16:49:59 2018 +0200 @@ -100,6 +100,12 @@ ##################################################################### EmbedResources( + # Resources coming from the core of Orthanc. They must be copied + # here, as HAS_EMBEDDED_RESOURCES is set to ON in + # "OrthancStoneParameters.cmake" + ${DCMTK_DICTIONARIES} + + # Resources specific to the Stone of Orthanc COLORMAP_HOT ${ORTHANC_STONE_ROOT}/Resources/Colormaps/hot.lut COLORMAP_JET ${ORTHANC_STONE_ROOT}/Resources/Colormaps/jet.lut COLORMAP_RED ${ORTHANC_STONE_ROOT}/Resources/Colormaps/red.lut @@ -212,6 +218,7 @@ ${PLATFORM_SOURCES} ${APPLICATIONS_SOURCES} ${ORTHANC_CORE_SOURCES} + ${ORTHANC_DICOM_SOURCES} ${AUTOGENERATED_SOURCES} # Mandatory components diff -r 4f0f8026700c -r 86ccff58f344 Resources/CMake/OrthancStoneParameters.cmake --- a/Resources/CMake/OrthancStoneParameters.cmake Fri Jun 08 16:18:45 2018 +0200 +++ b/Resources/CMake/OrthancStoneParameters.cmake Wed Jul 04 16:49:59 2018 +0200 @@ -28,9 +28,10 @@ set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) set(ENABLE_GOOGLE_TEST ON) set(ENABLE_SQLITE OFF) -SET(ENABLE_JPEG ON) -SET(ENABLE_PNG ON) -SET(ENABLE_ZLIB ON) +set(ENABLE_JPEG ON) +set(ENABLE_PNG ON) +set(ENABLE_ZLIB ON) +set(HAS_EMBEDDED_RESOURCES ON) #####################################################################