diff options
| author | Jan Van Buggenhout <chipzz@chipzz.be> | 2021-06-13 18:16:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-13 18:16:53 +0200 |
| commit | 12668692ea11b10c7ec472577a87c70f5e0c9a17 (patch) | |
| tree | ff97136a7ba612fcef90c0508281cf0b923c9623 /dep/boost | |
| parent | e9a8cea018591334ce3807e2eb2fc2d6ce079252 (diff) | |
Build/CMake: Only complain about missing BOOST_ROOT when Boost is not found (#26598)
Diffstat (limited to 'dep/boost')
| -rw-r--r-- | dep/boost/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index 9f4fa907bc5..7af1e7be31f 100644 --- a/dep/boost/CMakeLists.txt +++ b/dep/boost/CMakeLists.txt @@ -14,8 +14,6 @@ if(WIN32) set(BOOST_ROOT $ENV{BOOST_ROOT}) list(APPEND BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.2 ) - 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() set(Boost_USE_STATIC_LIBS ON) @@ -39,6 +37,12 @@ endif() find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem program_options iostreams regex) +if(NOT Boost_FOUND) + if(NOT DEFINED ENV{BOOST_ROOT} AND 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() +endif() + # Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS set(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIR}) |