# HG changeset patch # User Sebastien Jodogne # Date 1589538531 -7200 # Node ID 95674f9c169a96b39d68c9aa1ab59c3b252c6eec # Parent b424028392cfcc0fe578afd5fb378ec23beac1d1 fix diff -r b424028392cf -r 95674f9c169a Resources/CMake/BoostExtendedConfiguration.cmake --- 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() diff -r b424028392cf -r 95674f9c169a Samples/Sdl/CMakeLists.txt --- 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})