# HG changeset patch # User Sebastien Jodogne # Date 1594063746 -7200 # Node ID c77a9079693a151779c5ff36099a41fc0cd1a031 # Parent e15ce9a7083c31c004cc3ead64a4c8e6131285c6 sync diff -r e15ce9a7083c -r c77a9079693a Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Mon Jul 06 16:15:47 2020 +0200 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Mon Jul 06 21:29:06 2020 +0200 @@ -438,7 +438,7 @@ # Look for mandatory dependency Boost (cf. BoostConfiguration.cmake) include(FindBoost) - find_package(Boost COMPONENTS filesystem thread system date_time regex) + find_package(Boost COMPONENTS filesystem thread system date_time regex ${ORTHANC_BOOST_COMPONENTS}) if (NOT Boost_FOUND) message(FATAL_ERROR "Unable to locate Boost on this system") @@ -526,6 +526,9 @@ message(FATAL_ERROR "Cannot find the Orthanc framework") endif() + unset(CMAKE_REQUIRED_INCLUDES) + unset(CMAKE_REQUIRED_LIBRARIES) + if (NOT "${ORTHANC_FRAMEWORK_ROOT}" STREQUAL "") include_directories(${ORTHANC_FRAMEWORK_ROOT}) endif()