diff options
| author | Mai <mathew1800@gmail.com> | 2022-10-08 02:25:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-08 02:25:51 +0200 |
| commit | b7ad83383f70650dee3d0fdc4b29bbdfc2f30fbb (patch) | |
| tree | 048157f74415901ff507337c08d52b33092bcabd | |
| parent | Merge pull request #9030 from Morph1984/api-disable (diff) | |
| parent | cmake: Fix FindPkgConfig (diff) | |
| download | yuzu-b7ad83383f70650dee3d0fdc4b29bbdfc2f30fbb.tar yuzu-b7ad83383f70650dee3d0fdc4b29bbdfc2f30fbb.tar.gz yuzu-b7ad83383f70650dee3d0fdc4b29bbdfc2f30fbb.tar.bz2 yuzu-b7ad83383f70650dee3d0fdc4b29bbdfc2f30fbb.tar.lz yuzu-b7ad83383f70650dee3d0fdc4b29bbdfc2f30fbb.tar.xz yuzu-b7ad83383f70650dee3d0fdc4b29bbdfc2f30fbb.tar.zst yuzu-b7ad83383f70650dee3d0fdc4b29bbdfc2f30fbb.zip | |
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 20dd1383f..957df54f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ if(ENABLE_QT) endif() # Check for headers - Include(FindPkgConfig REQUIRED) + find_package(PkgConfig REQUIRED) pkg_check_modules(QT_DEP_GLU QUIET glu>=9.0.0) if (NOT QT_DEP_GLU_FOUND) message(FATAL_ERROR "Qt bundled pacakge dependency `glu` not found. \ @@ -386,7 +386,7 @@ endif() # Ensure libusb is properly configured (based on dolphin libusb include) if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB) - include(FindPkgConfig) + find_package(PkgConfig) if (PKG_CONFIG_FOUND AND NOT CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD") pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24) else() @@ -410,7 +410,7 @@ set(FFmpeg_COMPONENTS swscale) if (UNIX AND NOT APPLE) - Include(FindPkgConfig REQUIRED) + find_package(PkgConfig REQUIRED) pkg_check_modules(LIBVA libva) endif() if (NOT YUZU_USE_BUNDLED_FFMPEG) diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 20ad716ea..0baac8e17 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -43,7 +43,7 @@ if (NOT WIN32) CACHE PATH "Paths to FFmpeg libraries" FORCE) endforeach() - Include(FindPkgConfig REQUIRED) + find_package(PkgConfig REQUIRED) pkg_check_modules(LIBVA libva) pkg_check_modules(CUDA cuda) pkg_check_modules(FFNVCODEC ffnvcodec) diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 055b89295..3cb1b3687 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt @@ -108,7 +108,7 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE) target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - Include(FindPkgConfig) + find_package(PkgConfig) pkg_check_modules(LIBUDEV REQUIRED libudev) if (LIBUDEV_FOUND) |