diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-12-29 11:48:45 -0800 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-12-29 11:48:45 -0800 |
| commit | 8c7d654ad0bb49684e0badb64fc84d72053d4ac9 (patch) | |
| tree | a3650d1cc7a1707db608f5612165ef7364a313bb /cmake | |
| parent | 6a8fc327dc2cbd1fa63b9acd08fa90baea0758e8 (diff) | |
| parent | 80d1e9defd24f1e52622bfb75b670a32bd81854f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index 7c0d42134a..23bea41add 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -50,11 +50,12 @@ if(MSVC) endif(BOOST_ALL_DYN_LINK) endif(MSVC) +# Boost 1.52 disabled, see https://svn.boost.org/trac/boost/ticket/7669 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.50.0" "1.50" "1.51.0" "1.51" "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" "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" |