mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 02:10:40 +02:00
Merge pull request #9537 from abouvier/cmake-almost-quiet
cmake: improve find_package failure messages
This commit is contained in:
commit
48bcb91a2e
@ -207,42 +207,43 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
|
|||||||
# System imported libraries
|
# System imported libraries
|
||||||
# =======================================================================
|
# =======================================================================
|
||||||
|
|
||||||
find_package(enet 1.3)
|
# Enforce the search mode of non-required packages for better and shorter failure messages
|
||||||
|
find_package(enet 1.3 MODULE)
|
||||||
find_package(fmt 9 REQUIRED)
|
find_package(fmt 9 REQUIRED)
|
||||||
find_package(inih)
|
find_package(inih MODULE)
|
||||||
find_package(lz4 REQUIRED)
|
find_package(lz4 REQUIRED)
|
||||||
find_package(nlohmann_json 3.8 REQUIRED)
|
find_package(nlohmann_json 3.8 REQUIRED)
|
||||||
find_package(Opus 1.3)
|
find_package(Opus 1.3 MODULE)
|
||||||
find_package(ZLIB 1.2 REQUIRED)
|
find_package(ZLIB 1.2 REQUIRED)
|
||||||
find_package(zstd 1.5 REQUIRED)
|
find_package(zstd 1.5 REQUIRED)
|
||||||
|
|
||||||
if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
|
if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
|
||||||
find_package(Vulkan 1.3.238)
|
find_package(Vulkan 1.3.238 REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_LIBUSB)
|
if (ENABLE_LIBUSB)
|
||||||
find_package(libusb 1.0.24)
|
find_package(libusb 1.0.24 MODULE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
|
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
|
||||||
find_package(xbyak 6 QUIET)
|
find_package(xbyak 6 CONFIG)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
|
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
|
||||||
find_package(dynarmic 6.4.0 QUIET)
|
find_package(dynarmic 6.4.0 CONFIG)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_CUBEB)
|
if (ENABLE_CUBEB)
|
||||||
find_package(cubeb QUIET)
|
find_package(cubeb CONFIG)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (USE_DISCORD_PRESENCE)
|
if (USE_DISCORD_PRESENCE)
|
||||||
find_package(DiscordRPC QUIET)
|
find_package(DiscordRPC MODULE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_WEB_SERVICE)
|
if (ENABLE_WEB_SERVICE)
|
||||||
find_package(cpp-jwt 1.4 QUIET)
|
find_package(cpp-jwt 1.4 CONFIG)
|
||||||
find_package(httplib 0.11 QUIET)
|
find_package(httplib 0.11 MODULE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_TESTS)
|
if (YUZU_TESTS)
|
||||||
|
2
externals/find-modules/Findhttplib.cmake
vendored
2
externals/find-modules/Findhttplib.cmake
vendored
@ -5,7 +5,7 @@
|
|||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
|
|
||||||
find_package(httplib QUIET CONFIG)
|
find_package(httplib QUIET CONFIG)
|
||||||
if (httplib_FOUND)
|
if (httplib_CONSIDERED_CONFIGS)
|
||||||
find_package_handle_standard_args(httplib CONFIG_MODE)
|
find_package_handle_standard_args(httplib CONFIG_MODE)
|
||||||
else()
|
else()
|
||||||
find_package(PkgConfig QUIET)
|
find_package(PkgConfig QUIET)
|
||||||
|
2
externals/find-modules/Findlz4.cmake
vendored
2
externals/find-modules/Findlz4.cmake
vendored
@ -4,7 +4,7 @@
|
|||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
|
|
||||||
find_package(lz4 QUIET CONFIG)
|
find_package(lz4 QUIET CONFIG)
|
||||||
if (lz4_FOUND)
|
if (lz4_CONSIDERED_CONFIGS)
|
||||||
find_package_handle_standard_args(lz4 CONFIG_MODE)
|
find_package_handle_standard_args(lz4 CONFIG_MODE)
|
||||||
else()
|
else()
|
||||||
find_package(PkgConfig QUIET)
|
find_package(PkgConfig QUIET)
|
||||||
|
2
externals/find-modules/Findzstd.cmake
vendored
2
externals/find-modules/Findzstd.cmake
vendored
@ -4,7 +4,7 @@
|
|||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
|
|
||||||
find_package(zstd QUIET CONFIG)
|
find_package(zstd QUIET CONFIG)
|
||||||
if (zstd_FOUND)
|
if (zstd_CONSIDERED_CONFIGS)
|
||||||
find_package_handle_standard_args(zstd CONFIG_MODE)
|
find_package_handle_standard_args(zstd CONFIG_MODE)
|
||||||
else()
|
else()
|
||||||
find_package(PkgConfig QUIET)
|
find_package(PkgConfig QUIET)
|
||||||
|
Loading…
Reference in New Issue
Block a user