summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2021-05-01 22:21:05 -0700
committerGravatar GitHub2021-05-01 22:21:05 -0700
commit54dc22285bd5adba8885ae202f96ec0a9bc6c638 (patch)
tree05d9d9df07d1636ba9ac1c9ca0a550840f18ab8f
parentMerge pull request #6261 from Kewlan/game-list-filter-fix (diff)
parentcmake: Only config Boost during find_package (diff)
downloadyuzu-54dc22285bd5adba8885ae202f96ec0a9bc6c638.tar.gz
yuzu-54dc22285bd5adba8885ae202f96ec0a9bc6c638.tar.xz
yuzu-54dc22285bd5adba8885ae202f96ec0a9bc6c638.zip
Merge pull request #6245 from lat9nq/boost-only-config
cmake: Only config Boost during find_package
-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}")