summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Morman <jmorman@perspectalabs.com>2019-11-20 12:10:19 -0500
committerMartin Braun <martin.braun@ettus.com>2020-01-01 14:28:22 -0800
commit58d66aedf87aa12c701379f919de150e3f4d09ee (patch)
treee807be9940a0a2c22c78e136a0e2d5a2e4618977
parent12de35d23071fe957ed78078fcbda99d2fc38207 (diff)
cmake: add boost 1.71 as acceptable version
-rw-r--r--cmake/Modules/GrBoost.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake
index 670e610541..7c4b4e6e26 100644
--- a/cmake/Modules/GrBoost.cmake
+++ b/cmake/Modules/GrBoost.cmake
@@ -72,19 +72,21 @@ if(MSVC)
endif(BOOST_ALL_DYN_LINK)
endif(MSVC)
-find_package(Boost ${GR_BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
-
# This does not allow us to disable specific versions. It is used
# internally by cmake to know the formation newer versions. As newer
# Boost version beyond what is shown here are produced, we must extend
# this list. To disable Boost versions, see below.
+
set(Boost_ADDITIONAL_VERSIONS
"1.53" "1.54.0" "1.54"
"1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
"1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
"1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
+ "1.71.0" "1.71"
)
+find_package(Boost ${GR_BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
+
# Boost 1.52 disabled, see https://svn.boost.org/trac/boost/ticket/7669
# Similar problems with Boost 1.46 and 1.47.