diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-01 22:21:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-01 22:21:05 -0700 |
| commit | 54dc22285bd5adba8885ae202f96ec0a9bc6c638 (patch) | |
| tree | 05d9d9df07d1636ba9ac1c9ca0a550840f18ab8f | |
| parent | 03b3c5800bc06655a1e50a016c7051214f5de981 (diff) | |
| parent | 697a2c0018e3c25f1af8ae9fd2ead350ee7b88b4 (diff) | |
Merge pull request #6245 from lat9nq/boost-only-config
cmake: Only config Boost during find_package
| -rw-r--r-- | CMakeLists.txt | 4 |
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}") |