From 55d72c9530252ce8fbe929e674171dee2ec70958 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Sat, 19 Jun 2021 06:00:10 +0200 Subject: [PATCH] refactor(Build/CMake): Only complain when BOOST_ROOT was not found (#6418) Cherry-picked from commit (TrinityCore/TrinityCore@1266869) Co-authored-by: Jan Van Buggenhout <1895262+chipzz@users.noreply.github.com> --- deps/boost/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deps/boost/CMakeLists.txt b/deps/boost/CMakeLists.txt index 8d04c558c..ffab0f52f 100644 --- a/deps/boost/CMakeLists.txt +++ b/deps/boost/CMakeLists.txt @@ -19,8 +19,6 @@ if(WIN32) set(BOOST_ROOT $ENV{BOOST_ROOT}) list(APPEND BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.2) - else() - 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})