diff options
| -rwxr-xr-x | appveyor.yml | 2 | ||||
| -rw-r--r-- | build/cmake/BoostMacros.cmake | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml index 74c92f1fa..ef729eb2a 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -62,7 +62,7 @@ environment: - PROFILE: MINGW PLATFORM: x64 CONFIGURATION: RelWithDebInfo - DISABLED_TESTS: (StressTestNonBlocking) + DISABLED_TESTS: (StalenessCheckTest|StressTestNonBlocking) - PROFILE: CYGWIN PLATFORM: x64 diff --git a/build/cmake/BoostMacros.cmake b/build/cmake/BoostMacros.cmake index 0c7f13dfa..61be622ec 100644 --- a/build/cmake/BoostMacros.cmake +++ b/build/cmake/BoostMacros.cmake @@ -19,14 +19,22 @@ set(BOOST_MINREV 1.53) +# we are not ready for the new style link targets introduced in +# boost 1.70.0 and cmake 3.14.2 which showed up on appveyor in +# mingw builds +set(Boost_NO_BOOST_CMAKE ON) + macro(REQUIRE_BOOST_HEADERS) find_package(Boost ${BOOST_MINREV} QUIET REQUIRED) if (NOT Boost_FOUND) string(CONCAT fatal_message - "Boost 1.53 or later is required to build sources in ${CMAKE_CURRENT_SOURCE_DIR}") + "Boost ${BOOST_MINREV} or later is required to build sources in ${CMAKE_CURRENT_SOURCE_DIR}") message(FATAL_ERROR, ${fatal_message}) endif() - include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") + if (DEFINED Boost_INCLUDE_DIRS) + # pre-boost 1.70.0 aware cmake, otherwise it is using targets + include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") + endif() endmacro() macro(REQUIRE_BOOST_LIBRARIES libs) @@ -34,7 +42,7 @@ macro(REQUIRE_BOOST_LIBRARIES libs) find_package(Boost ${BOOST_MINREV} REQUIRED COMPONENTS ${${libs}}) if (NOT Boost_FOUND) string(CONCAT fatal_message - "Boost 1.53 or later is required to build sources in ${CMAKE_CURRENT_SOURCE_DIR}, " + "Boost ${BOOST_MINREV} or later is required to build sources in ${CMAKE_CURRENT_SOURCE_DIR}, " "or use -DBUILD_TESTING=OFF") message(FATAL_ERROR, ${fatal_message}) endif() |