changeset 159:efb85e380cff

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 06 Jul 2020 21:10:32 +0200
parents ceaa2e4458d5
children 84b6fc6f6b9b
files Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Mon Jul 06 16:14:42 2020 +0200
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Mon Jul 06 21:10:32 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()