From 8adca7637b6defd3f8be78251f42a73ca38afc1c Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 30 May 2020 17:43:56 +0200 Subject: [PATCH] Build system: Removed hard requirement on BOOST_ROOT being set as environment variable, it can now be also passed as command line argument to cmake and fix compile warning with boost 1.73 --- dep/boost/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index 63d3d80f91b..1714b3724b5 100644 --- a/dep/boost/CMakeLists.txt +++ b/dep/boost/CMakeLists.txt @@ -9,7 +9,7 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. if(WIN32) - set(BOOST_DEBUG ON) + set(BOOST_DEBUG ON) if(DEFINED ENV{BOOST_ROOT}) set(BOOST_ROOT $ENV{BOOST_ROOT}) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0) @@ -29,7 +29,7 @@ if(WIN32) endif() endif() endif() - else() + elseif(NOT DEFINED Boost_DIR AND NOT DEFINED BOOST_ROOT AND NOT DEFINED BOOSTROOT) message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.") endif() @@ -92,7 +92,8 @@ target_compile_definitions(boost -DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE -DBOOST_SERIALIZATION_NO_LIB -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE - -DBOOST_ASIO_NO_DEPRECATED) + -DBOOST_ASIO_NO_DEPRECATED + -DBOOST_BIND_NO_PLACEHOLDERS) if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM) target_compile_definitions(boost