Mercurial > hg > orthanc-stone
comparison 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 |
comparison
equal
deleted
inserted
replaced
558:d5579bdc59b5 | 561:1201b12eb9f8 |
---|---|
23 ##################################################################### | 23 ##################################################################### |
24 | 24 |
25 if (ENABLE_DCMTK) | 25 if (ENABLE_DCMTK) |
26 set(ENABLE_LOCALE ON) | 26 set(ENABLE_LOCALE ON) |
27 else() | 27 else() |
28 set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) | 28 if (NOT DEFINED ENABLE_LOCALE) |
29 set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) | |
30 endif() | |
29 endif() | 31 endif() |
30 | 32 |
31 include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) | 33 include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) |
32 include_directories(${ORTHANC_ROOT}) | 34 include_directories(${ORTHANC_ROOT}) |
33 include_directories(${ORTHANC_ROOT}/Core/Images) # hack for the numerous #include "../Enumerations.h" in Orthanc to work | 35 include_directories(${ORTHANC_ROOT}/Core/Images) # hack for the numerous #include "../Enumerations.h" in Orthanc to work |
139 COLORMAP_HOT ${ORTHANC_STONE_ROOT}/Resources/Colormaps/hot.lut | 141 COLORMAP_HOT ${ORTHANC_STONE_ROOT}/Resources/Colormaps/hot.lut |
140 COLORMAP_JET ${ORTHANC_STONE_ROOT}/Resources/Colormaps/jet.lut | 142 COLORMAP_JET ${ORTHANC_STONE_ROOT}/Resources/Colormaps/jet.lut |
141 COLORMAP_RED ${ORTHANC_STONE_ROOT}/Resources/Colormaps/red.lut | 143 COLORMAP_RED ${ORTHANC_STONE_ROOT}/Resources/Colormaps/red.lut |
142 COLORMAP_GREEN ${ORTHANC_STONE_ROOT}/Resources/Colormaps/green.lut | 144 COLORMAP_GREEN ${ORTHANC_STONE_ROOT}/Resources/Colormaps/green.lut |
143 COLORMAP_BLUE ${ORTHANC_STONE_ROOT}/Resources/Colormaps/blue.lut | 145 COLORMAP_BLUE ${ORTHANC_STONE_ROOT}/Resources/Colormaps/blue.lut |
146 | |
147 # Additional resources specific to the application being built | |
148 ${ORTHANC_STONE_APPLICATION_RESOURCES} | |
144 ) | 149 ) |
145 | |
146 | 150 |
147 | 151 |
148 ##################################################################### | 152 ##################################################################### |
149 ## System-specific patches | 153 ## System-specific patches |
150 ##################################################################### | 154 ##################################################################### |