mirror of
https://github.com/yuzu-emu/yuzu-mainline.git
synced 2024-12-12 16:54:17 +01:00
cmake/conan: Conditionally add target Boost::context
Addresses an issue with the two competing versions of Conan's Boost package that are currently floating around. Adds the Boost::context target only if it's recognized by CMake as a target.
This commit is contained in:
parent
c96930fd9d
commit
9b023a56a3
@ -194,13 +194,18 @@ macro(yuzu_find_packages)
|
|||||||
unset(FN_FORCE_REQUIRED)
|
unset(FN_FORCE_REQUIRED)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
if (NOT Boost_FOUND)
|
find_package(Boost 1.73.0 COMPONENTS context headers QUIET)
|
||||||
find_package(Boost 1.73.0 COMPONENTS context headers QUIET)
|
if (Boost_FOUND)
|
||||||
if (Boost_FOUND)
|
set(Boost_LIBRARIES Boost::boost)
|
||||||
set(Boost_LIBRARIES Boost::boost Boost::context)
|
# Conditionally add Boost::context only if the active version of the Conan or system Boost package provides it
|
||||||
|
# The old version is missing Boost::context, so we want to avoid adding in that case
|
||||||
|
# The new version requires adding Boost::context to prevent linking issues
|
||||||
|
#
|
||||||
|
# This one is used by Conan on subsequent CMake configures, not the first configure.
|
||||||
|
if (TARGET Boost::context)
|
||||||
|
list(APPEND Boost_LIBRARIES Boost::context)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
else()
|
||||||
if (NOT Boost_FOUND)
|
|
||||||
message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan")
|
message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan")
|
||||||
list(APPEND CONAN_REQUIRED_LIBS "boost/1.73.0")
|
list(APPEND CONAN_REQUIRED_LIBS "boost/1.73.0")
|
||||||
endif()
|
endif()
|
||||||
@ -312,6 +317,12 @@ if (CONAN_REQUIRED_LIBS)
|
|||||||
if (NOT Boost_FOUND)
|
if (NOT Boost_FOUND)
|
||||||
find_package(Boost 1.73.0 REQUIRED COMPONENTS context headers)
|
find_package(Boost 1.73.0 REQUIRED COMPONENTS context headers)
|
||||||
set(Boost_LIBRARIES Boost::boost)
|
set(Boost_LIBRARIES Boost::boost)
|
||||||
|
# Conditionally add Boost::context only if the active version of the Conan Boost package provides it
|
||||||
|
# The old version is missing Boost::context, so we want to avoid adding in that case
|
||||||
|
# The new version requires adding Boost::context to prevent linking issues
|
||||||
|
if (TARGET Boost::context)
|
||||||
|
list(APPEND Boost_LIBRARIES Boost::context)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Due to issues with variable scopes in functions, we need to also find_package(qt5) outside of the function
|
# Due to issues with variable scopes in functions, we need to also find_package(qt5) outside of the function
|
||||||
|
Loading…
Reference in New Issue
Block a user