summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lat9nq2021-04-25 21:02:39 -0400
committerGravatar lat9nq2021-04-25 21:02:39 -0400
commit697a2c0018e3c25f1af8ae9fd2ead350ee7b88b4 (patch)
tree34fda3f310957796013496426662aa08730262a7
parentMerge pull request #6238 from ameerj/vk-bgr-fix (diff)
downloadyuzu-697a2c0018e3c25f1af8ae9fd2ead350ee7b88b4.tar.gz
yuzu-697a2c0018e3c25f1af8ae9fd2ead350ee7b88b4.tar.xz
yuzu-697a2c0018e3c25f1af8ae9fd2ead350ee7b88b4.zip
cmake: Only config Boost during find_package
Without the CONFIG option, find_package will perform Module search. On at least Linux Mint 20 (I'm unable to reproduce this on CentOS and Arch Linux), my guess is that this causes CMake to find "dirty" modules that modify the configuration state despite the Boost version being too low/absent. Use CONFIG to put CMake into pure Config mode and avoid Module search.
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15ecb8a9c..73274c2e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,7 +202,7 @@ macro(yuzu_find_packages)
202endmacro() 202endmacro()
203 203
204if (NOT YUZU_USE_BUNDLED_BOOST) 204if (NOT YUZU_USE_BUNDLED_BOOST)
205 find_package(Boost 1.73.0 COMPONENTS context headers QUIET) 205 find_package(Boost 1.73.0 CONFIG COMPONENTS context headers QUIET)
206endif() 206endif()
207if (Boost_FOUND) 207if (Boost_FOUND)
208 set(Boost_LIBRARIES Boost::boost) 208 set(Boost_LIBRARIES Boost::boost)
@@ -224,7 +224,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST)
224 download_bundled_external("boost/" ${Boost_EXT_NAME} "") 224 download_bundled_external("boost/" ${Boost_EXT_NAME} "")
225 set(Boost_USE_DEBUG_RUNTIME FALSE) 225 set(Boost_USE_DEBUG_RUNTIME FALSE)
226 set(Boost_USE_STATIC_LIBS ON) 226 set(Boost_USE_STATIC_LIBS ON)
227 find_package(Boost 1.75.0 REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH) 227 find_package(Boost 1.75.0 CONFIG REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH)
228 # Manually set the include dirs since the find_package sets it incorrectly 228 # Manually set the include dirs since the find_package sets it incorrectly
229 set(Boost_INCLUDE_DIRS ${Boost_PATH}/include CACHE PATH "Path to Boost headers" FORCE) 229 set(Boost_INCLUDE_DIRS ${Boost_PATH}/include CACHE PATH "Path to Boost headers" FORCE)
230 include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") 230 include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")