boost/gil
2
0
Fork 0
mirror of https://github.com/boostorg/gil.git synced 2026-02-19 02:22:09 +00:00
Code Issues Projects Releases Wiki Activity

[cmake] Restore downloading of FindBoost.cmake for CMake older than 3.11

Browse Source 
Download the module from the latest stable release, not master.
Require Boost 1.67 or later.

[ci skip]
This commit is contained in:
Mateusz Loskot
2018-04-11 19:45:32 +02:00
committed by Stefan Seefeld
parent 2a3b350c5f
commit 1a9a01ce5d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -26,6 +26,17 @@ option(GIL_USE_CONAN "Use Conan to install dependencies" OFF)
# - look for default installation location
# - look for location specified with BOOST_ROOT
#-----------------------------------------------------------------------------
if (CMAKE_VERSION VERSION_LESS 3.11)
# Latest FindBoost.cmake has likely been updated to detect Boost version not yet released
if (NOT EXISTS "${CMAKE_BINARY_DIR}/cmake/FindBoost.cmake")
message(STATUS "Downloading FindBoost.cmake from https://gitlab.kitware.com/cmake/ release branch")
file(DOWNLOAD
"https://gitlab.kitware.com/cmake/cmake/raw/release/Modules/FindBoost.cmake"
"${CMAKE_BINARY_DIR}/cmake/FindBoost.cmake")
endif()
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_BINARY_DIR}/cmake)
endif()
if(GIL_USE_BOOST_STAGE AND NOT DEFINED BOOST_ROOT AND NOT DEFINED ENV{BOOST_ROOT})
get_filename_component(_boost_root ../../ ABSOLUTE)
if(EXISTS ${_boost_root}/boost-build.jam)
@@ -39,14 +50,13 @@ if(GIL_BUILD_TESTS)
list(APPEND BOOST_COMPONENTS unit_test_framework filesystem)
endif()
set(Boost_ADDITIONAL_VERSIONS "1.67.0" "1.67" "1.66.0" "1.66")
set(Boost_DETAILED_FAILURE_MSG ON)
if(MSVC)
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_STATIC_RUNTIME OFF)
endif()
find_package(Boost 1.66.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
find_package(Boost 1.67.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
# The boostorg/gil repository includes must come first,
# before Boost includes from cloned Boost superproject or installed distribution.