# HG changeset patch # User Sebastien Jodogne # Date 1594063946 -7200 # Node ID 6c328ca731650f9aec43f5a6c989b4c87ed95ae5 # Parent 92b93845d84bd21a43126a5e14cde0875f838c4f sync diff -r 92b93845d84b -r 6c328ca73165 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Mon Jul 06 13:20:02 2020 +0200 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Mon Jul 06 21:32:26 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()