Mercurial > hg > orthanc-stone
diff Resources/CMake/OrthancStoneConfiguration.cmake @ 561:1201b12eb9f8 dev
merge default -> dev
| author | Alain Mazy <alain@mazy.be> |
|---|---|
| date | Thu, 18 Apr 2019 09:30:00 +0200 |
| parents | 7016c35d163c efdf45c5aeb0 |
| children | 109963050112 |
line wrap: on
line diff
--- a/Resources/CMake/OrthancStoneConfiguration.cmake Wed Apr 17 16:13:42 2019 +0200 +++ b/Resources/CMake/OrthancStoneConfiguration.cmake Thu Apr 18 09:30:00 2019 +0200 @@ -25,7 +25,9 @@ if (ENABLE_DCMTK) set(ENABLE_LOCALE ON) else() - set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) + if (NOT DEFINED ENABLE_LOCALE) + set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) + endif() endif() include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) @@ -141,10 +143,12 @@ COLORMAP_RED ${ORTHANC_STONE_ROOT}/Resources/Colormaps/red.lut COLORMAP_GREEN ${ORTHANC_STONE_ROOT}/Resources/Colormaps/green.lut COLORMAP_BLUE ${ORTHANC_STONE_ROOT}/Resources/Colormaps/blue.lut + + # Additional resources specific to the application being built + ${ORTHANC_STONE_APPLICATION_RESOURCES} ) - ##################################################################### ## System-specific patches #####################################################################