diff options
| author | 2021-06-13 01:15:54 -0400 | |
|---|---|---|
| committer | 2021-06-13 01:15:54 -0400 | |
| commit | 932c0184a72b716fa9af26e1e8d3d76a469a787c (patch) | |
| tree | 6f365cf340974340c5b1e6bc6b2ae62305f93008 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 97afaf1a9..f0e892a97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -473,7 +473,15 @@ if (YUZU_USE_BUNDLED_FFMPEG) | |||
| 473 | 473 | ||
| 474 | # FFmpeg has source that requires one of nasm or yasm to assemble it. | 474 | # FFmpeg has source that requires one of nasm or yasm to assemble it. |
| 475 | # REQUIRED throws an error if not found here during configuration rather than during compilation. | 475 | # REQUIRED throws an error if not found here during configuration rather than during compilation. |
| 476 | find_program(ASSEMBLER NAMES nasm yasm REQUIRED) | 476 | find_program(ASSEMBLER NAMES nasm yasm) |
| 477 | if ("${ASSEMBLER}" STREQUAL "ASSEMBLER-NOTFOUND") | ||
| 478 | message(FATAL_ERROR "One of either `nasm` or `yasm` not found but is required.") | ||
| 479 | endif() | ||
| 480 | |||
| 481 | find_program(AUTOCONF autoconf) | ||
| 482 | if ("${AUTOCONF}" STREQUAL "AUTOCONF-NOTFOUND") | ||
| 483 | message(FATAL_ERROR "Required program `autoconf` not found.") | ||
| 484 | endif() | ||
| 477 | 485 | ||
| 478 | set(FFmpeg_PREFIX ${PROJECT_SOURCE_DIR}/externals/ffmpeg) | 486 | set(FFmpeg_PREFIX ${PROJECT_SOURCE_DIR}/externals/ffmpeg) |
| 479 | set(FFmpeg_BUILD_DIR ${PROJECT_BINARY_DIR}/externals/ffmpeg) | 487 | set(FFmpeg_BUILD_DIR ${PROJECT_BINARY_DIR}/externals/ffmpeg) |