Mercurial > hg > orthanc-stone
changeset 1425:95674f9c169a
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 15 May 2020 12:28:51 +0200 |
| parents | b424028392cf |
| children | 1e132fe7090e |
| files | Resources/CMake/BoostExtendedConfiguration.cmake Samples/Sdl/CMakeLists.txt |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/BoostExtendedConfiguration.cmake Fri May 15 11:41:33 2020 +0200 +++ b/Resources/CMake/BoostExtendedConfiguration.cmake Fri May 15 12:28:51 2020 +0200 @@ -35,9 +35,5 @@ #${BOOST_SOURCES_DIR}/libs/program_options/src/winmain.cpp ) add_definitions(-DBOOST_PROGRAM_OPTIONS_NO_LIB) -else() - find_package(Boost COMPONENTS program_options) - include_directories(${Boost_INCLUDE_DIRS}) - link_libraries(${Boost_LIBRARIES}) endif()
--- a/Samples/Sdl/CMakeLists.txt Fri May 15 11:41:33 2020 +0200 +++ b/Samples/Sdl/CMakeLists.txt Fri May 15 12:28:51 2020 +0200 @@ -30,8 +30,9 @@ UBUNTU_FONT ${CMAKE_BINARY_DIR}/ubuntu-font-family-0.83/Ubuntu-R.ttf ) +list(APPEND ORTHANC_BOOST_COMPONENTS program_options) +include(${STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake) include(${STONE_ROOT}/Resources/CMake/BoostExtendedConfiguration.cmake) -include(${STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake) include(${STONE_ROOT}/Resources/CMake/Utilities.cmake) include_directories(${STONE_ROOT})