diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-26 19:04:17 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-26 19:04:17 -0700 |
| commit | d5777e144390ad15145c6ed30473e8bd923ae5ab (patch) | |
| tree | d73b5c18dc3bcae9d0b0449b16c772eec3dca949 /cmake | |
| parent | 7ed6005b9282f628754de9fdd565260805be4abe (diff) | |
| parent | 9d2486132a674fa5e50c74c8d01d371075b75b02 (diff) | |
Merge branch 'next' into python3
Conflicts:
CMakeLists.txt
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index 39a78c5b86..150009a7b9 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -68,15 +68,13 @@ if(MSVC) endif(BOOST_ALL_DYN_LINK) endif(MSVC) -find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) +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.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39" - "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49" "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "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" |