diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea7829707..55fdf8fcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -37,6 +37,8 @@ option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON) | |||
| 37 | 37 | ||
| 38 | option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") | 38 | option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") |
| 39 | 39 | ||
| 40 | option(YUZU_USE_EXTERNAL_VULKAN_HEADERS "Use Vulkan-Headers from externals" ON) | ||
| 41 | |||
| 40 | option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF) | 42 | option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF) |
| 41 | 43 | ||
| 42 | option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) | 44 | option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) |
| @@ -211,10 +213,13 @@ find_package(inih) | |||
| 211 | find_package(lz4 REQUIRED) | 213 | find_package(lz4 REQUIRED) |
| 212 | find_package(nlohmann_json 3.8 REQUIRED) | 214 | find_package(nlohmann_json 3.8 REQUIRED) |
| 213 | find_package(Opus 1.3) | 215 | find_package(Opus 1.3) |
| 214 | find_package(Vulkan 1.3.238) | ||
| 215 | find_package(ZLIB 1.2 REQUIRED) | 216 | find_package(ZLIB 1.2 REQUIRED) |
| 216 | find_package(zstd 1.5 REQUIRED) | 217 | find_package(zstd 1.5 REQUIRED) |
| 217 | 218 | ||
| 219 | if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) | ||
| 220 | find_package(Vulkan 1.3.238) | ||
| 221 | endif() | ||
| 222 | |||
| 218 | if (ENABLE_LIBUSB) | 223 | if (ENABLE_LIBUSB) |
| 219 | find_package(libusb 1.0.24) | 224 | find_package(libusb 1.0.24) |
| 220 | endif() | 225 | endif() |
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index a83812ebb..1b9ae0009 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -152,6 +152,6 @@ if (YUZU_USE_BUNDLED_FFMPEG) | |||
| 152 | endif() | 152 | endif() |
| 153 | 153 | ||
| 154 | # Vulkan-Headers | 154 | # Vulkan-Headers |
| 155 | if (NOT TARGET Vulkan::Headers) | 155 | if (YUZU_USE_EXTERNAL_VULKAN_HEADERS) |
| 156 | add_subdirectory(Vulkan-Headers EXCLUDE_FROM_ALL) | 156 | add_subdirectory(Vulkan-Headers EXCLUDE_FROM_ALL) |
| 157 | endif() | 157 | endif() |