Mercurial > hg > orthanc-stone
comparison Resources/CMake/OrthancStoneConfiguration.cmake @ 1470:390b0c30ba19
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 12 Jun 2020 17:38:07 +0200 |
parents | 323bf6040f5d |
children | 28c64c246312 |
comparison
equal
deleted
inserted
replaced
1469:fab051fdc56d | 1470:390b0c30ba19 |
---|---|
28 if (NOT DEFINED ENABLE_LOCALE) | 28 if (NOT DEFINED ENABLE_LOCALE) |
29 set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) | 29 set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) |
30 endif() | 30 endif() |
31 endif() | 31 endif() |
32 | 32 |
33 # "BoostExtendedConfiguration.cmake" *must* be included before | |
34 # "OrthancFrameworkConfiguration.cmake" | |
35 include(${CMAKE_CURRENT_LIST_DIR}/BoostExtendedConfiguration.cmake) | |
36 | |
37 include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) | 33 include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) |
38 include_directories( | 34 include_directories( |
39 ${ORTHANC_ROOT}/Core | 35 ${ORTHANC_ROOT}/Core |
40 ${ORTHANC_ROOT}/Plugins/Samples/Common | 36 ${ORTHANC_ROOT}/Plugins/Samples/Common |
41 ) | 37 ) |
94 ##################################################################### | 90 ##################################################################### |
95 | 91 |
96 SET(ORTHANC_STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../..) | 92 SET(ORTHANC_STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../..) |
97 | 93 |
98 include(FindPkgConfig) | 94 include(FindPkgConfig) |
95 include(${CMAKE_CURRENT_LIST_DIR}/BoostExtendedConfiguration.cmake) | |
99 include(${CMAKE_CURRENT_LIST_DIR}/CairoConfiguration.cmake) | 96 include(${CMAKE_CURRENT_LIST_DIR}/CairoConfiguration.cmake) |
100 include(${CMAKE_CURRENT_LIST_DIR}/FreetypeConfiguration.cmake) | 97 include(${CMAKE_CURRENT_LIST_DIR}/FreetypeConfiguration.cmake) |
101 include(${CMAKE_CURRENT_LIST_DIR}/PixmanConfiguration.cmake) | 98 include(${CMAKE_CURRENT_LIST_DIR}/PixmanConfiguration.cmake) |
102 | 99 |
103 | 100 |