summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt7
-rw-r--r--externals/CMakeLists.txt2
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
38option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") 38option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")
39 39
40option(YUZU_USE_EXTERNAL_VULKAN_HEADERS "Use Vulkan-Headers from externals" ON)
41
40option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF) 42option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
41 43
42option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) 44option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
@@ -211,10 +213,13 @@ find_package(inih)
211find_package(lz4 REQUIRED) 213find_package(lz4 REQUIRED)
212find_package(nlohmann_json 3.8 REQUIRED) 214find_package(nlohmann_json 3.8 REQUIRED)
213find_package(Opus 1.3) 215find_package(Opus 1.3)
214find_package(Vulkan 1.3.238)
215find_package(ZLIB 1.2 REQUIRED) 216find_package(ZLIB 1.2 REQUIRED)
216find_package(zstd 1.5 REQUIRED) 217find_package(zstd 1.5 REQUIRED)
217 218
219if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
220 find_package(Vulkan 1.3.238)
221endif()
222
218if (ENABLE_LIBUSB) 223if (ENABLE_LIBUSB)
219 find_package(libusb 1.0.24) 224 find_package(libusb 1.0.24)
220endif() 225endif()
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)
152endif() 152endif()
153 153
154# Vulkan-Headers 154# Vulkan-Headers
155if (NOT TARGET Vulkan::Headers) 155if (YUZU_USE_EXTERNAL_VULKAN_HEADERS)
156 add_subdirectory(Vulkan-Headers EXCLUDE_FROM_ALL) 156 add_subdirectory(Vulkan-Headers EXCLUDE_FROM_ALL)
157endif() 157endif()