diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-05-30 17:43:56 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-05-30 17:43:56 +0200 |
| commit | 161944b7643c62f9e7705c64e42d42e5d07f1959 (patch) | |
| tree | b192e73358fa89085d2ccc8e16a2e7123cc05783 /dep/boost | |
| parent | 1ae72db201189877c1b863fac140eb4b0a45c5bb (diff) | |
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
Diffstat (limited to 'dep/boost')
| -rw-r--r-- | dep/boost/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index f651c50b8df..09129f36173 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) @@ -21,7 +21,7 @@ if(WIN32) ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.1 ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0) 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() @@ -84,7 +84,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 |