summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-05-02 07:21:05 +0200
committerGitHub <noreply@github.com>2021-05-02 07:21:05 +0200
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
yuzu-54dc22285bd5adba8885ae202f96ec0a9bc6c638.tar.gz
yuzu-54dc22285bd5adba8885ae202f96ec0a9bc6c638.tar.bz2
yuzu-54dc22285bd5adba8885ae202f96ec0a9bc6c638.tar.lz
yuzu-54dc22285bd5adba8885ae202f96ec0a9bc6c638.tar.xz
yuzu-54dc22285bd5adba8885ae202f96ec0a9bc6c638.tar.zst
yuzu-54dc22285bd5adba8885ae202f96ec0a9bc6c638.zip
-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)
endmacro()
if (NOT YUZU_USE_BUNDLED_BOOST)
- find_package(Boost 1.73.0 COMPONENTS context headers QUIET)
+ find_package(Boost 1.73.0 CONFIG COMPONENTS context headers QUIET)
endif()
if (Boost_FOUND)
set(Boost_LIBRARIES Boost::boost)
@@ -224,7 +224,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST)
download_bundled_external("boost/" ${Boost_EXT_NAME} "")
set(Boost_USE_DEBUG_RUNTIME FALSE)
set(Boost_USE_STATIC_LIBS ON)
- find_package(Boost 1.75.0 REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH)
+ find_package(Boost 1.75.0 CONFIG REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH)
# Manually set the include dirs since the find_package sets it incorrectly
set(Boost_INCLUDE_DIRS ${Boost_PATH}/include CACHE PATH "Path to Boost headers" FORCE)
include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")