diff options
| author | Tom Rondeau | 2013-02-13 14:05:02 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2013-02-13 14:05:02 -0500 |
| commit | b670f5f5afafad23b2ffc3e031b8970b48c5bfa0 (patch) | |
| tree | 240a5f5b14d91de24d8a47b374af9bef66574440 /cmake/Modules/GrBoost.cmake | |
| parent | ae04206343815406d8c8a1686c32b7f43066006a (diff) | |
| parent | df4cd09f0f4c80b36edf17d9c1d7ca28d3fd3ba4 (diff) | |
| download | gnuradio-b670f5f5afafad23b2ffc3e031b8970b48c5bfa0.tar.gz gnuradio-b670f5f5afafad23b2ffc3e031b8970b48c5bfa0.tar.bz2 gnuradio-b670f5f5afafad23b2ffc3e031b8970b48c5bfa0.zip | |
Merge branch 'maint'
Diffstat (limited to 'cmake/Modules/GrBoost.cmake')
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index dfd17fc24..38cb027f8 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -69,6 +69,11 @@ set(Boost_ADDITIONAL_VERSIONS # Boost 1.52 disabled, see https://svn.boost.org/trac/boost/ticket/7669 # Similar problems with Boost 1.46 and 1.47. +OPTION(ENABLE_BAD_BOOST "Enable known bad versions of Boost" OFF) +if(ENABLE_BAD_BOOST) + MESSAGE(STATUS "Enabling use of known bad versions of Boost.") +endif(ENABLE_BAD_BOOST) + # For any unsuitable Boost version, add the version number below in # the following format: XXYYZZ # Where: @@ -76,12 +81,17 @@ set(Boost_ADDITIONAL_VERSIONS # YY is the minor version number ('46' for 1.46) # ZZ is the patcher version number (typically just '00') set(Boost_NOGO_VERSIONS - 104600 104700 105200 -) + 104600 104700 105200 + ) foreach(ver ${Boost_NOGO_VERSIONS}) if(${Boost_VERSION} EQUAL ${ver}) - MESSAGE(STATUS "Found incompatible Boost (version ${Boost_VERSION}). Disabling.") - set(Boost_FOUND FALSE) + if(NOT ENABLE_BAD_BOOST) + MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.") + set(Boost_FOUND FALSE) + else(NOT ENABLE_BAD_BOOST) + MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Continuing anyway.") + set(Boost_FOUND TRUE) + endif(NOT ENABLE_BAD_BOOST) endif(${Boost_VERSION} EQUAL ${ver}) endforeach(ver) |