diff --git a/contrib/boost b/contrib/boost index 5a3fb87e67c..ae94606a70f 160000 --- a/contrib/boost +++ b/contrib/boost @@ -1 +1 @@ -Subproject commit 5a3fb87e67cc67ffadfc1990b3665fc3b260fcf4 +Subproject commit ae94606a70f1e298ce2a5718db858079185c4d9c diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt index 7c2f2b27c47..343e863e496 100644 --- a/contrib/boost-cmake/CMakeLists.txt +++ b/contrib/boost-cmake/CMakeLists.txt @@ -25,18 +25,16 @@ if (OS_LINUX) ) endif () -# headers-only +# headers-only add_library (_boost_headers_only INTERFACE) add_library (boost::headers_only ALIAS _boost_headers_only) target_include_directories (_boost_headers_only SYSTEM BEFORE INTERFACE ${LIBRARY_DIR}) -# asio - target_compile_definitions (_boost_headers_only INTERFACE BOOST_ASIO_STANDALONE=1 - # Avoid using of deprecated in c++ > 17 std::result_of - BOOST_ASIO_HAS_STD_INVOKE_RESULT=1 + BOOST_ASIO_HAS_STD_INVOKE_RESULT=1 # Avoid using of deprecated in c++ > 17 std::result_of + BOOST_TIMER_ENABLE_DEPRECATED=1 # wordnet-blast (enabled via USE_NLP) uses Boost legacy timer classes ) # iostreams