yuzu-emu/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2024-12-11 23:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5196 from lat9nq/fix-conan-boost-2

Browse Source 
cmake/conan: Conditionally add target Boost::context
This commit is contained in:
bunnei 2020-12-15 21:15:05 -08:00 committed by GitHub
commit ac3b4f918f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -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