diff options
| author | 2021-06-13 01:15:54 -0400 | |
|---|---|---|
| committer | 2021-06-13 01:15:54 -0400 | |
| commit | 932c0184a72b716fa9af26e1e8d3d76a469a787c (patch) | |
| tree | 6f365cf340974340c5b1e6bc6b2ae62305f93008 /src | |
| parent | Merge pull request #6453 from lat9nq/libusb-fix-msvc (diff) | |
| download | yuzu-932c0184a72b716fa9af26e1e8d3d76a469a787c.tar.gz yuzu-932c0184a72b716fa9af26e1e8d3d76a469a787c.tar.xz yuzu-932c0184a72b716fa9af26e1e8d3d76a469a787c.zip | |
cmake: Fix find_program usage for 3.15
yuzu requires CMake 3.15 yet find_program was using REQUIRED, which is
only available on 3.18 and later. Instead, we check for
"<VAR>-NOTFOUND".
In addition, check for additional requirements before building libusb or
FFmpeg with autotools. Otherwise, CMake configuration will pass yet
compilation will fail.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/host_shaders/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt index 2208e1922..c9cff7450 100644 --- a/src/video_core/host_shaders/CMakeLists.txt +++ b/src/video_core/host_shaders/CMakeLists.txt | |||
| @@ -18,7 +18,10 @@ set(SHADER_FILES | |||
| 18 | vulkan_uint8.comp | 18 | vulkan_uint8.comp |
| 19 | ) | 19 | ) |
| 20 | 20 | ||
| 21 | find_program(GLSLANGVALIDATOR "glslangValidator" REQUIRED) | 21 | find_program(GLSLANGVALIDATOR "glslangValidator") |
| 22 | if ("${GLSLANGVALIDATOR}" STREQUAL "GLSLANGVALIDATOR-NOTFOUND") | ||
| 23 | message(FATAL_ERROR "Required program `glslangValidator` not found.") | ||
| 24 | endif() | ||
| 22 | 25 | ||
| 23 | set(GLSL_FLAGS "") | 26 | set(GLSL_FLAGS "") |
| 24 | set(QUIET_FLAG "--quiet") | 27 | set(QUIET_FLAG "--quiet") |