diff options
| -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) | |||
| 252 | endif() | 252 | endif() |
| 253 | 253 | ||
| 254 | # Check for headers | 254 | # Check for headers |
| 255 | Include(FindPkgConfig REQUIRED) | 255 | find_package(PkgConfig REQUIRED) |
| 256 | pkg_check_modules(QT_DEP_GLU QUIET glu>=9.0.0) | 256 | pkg_check_modules(QT_DEP_GLU QUIET glu>=9.0.0) |
| 257 | if (NOT QT_DEP_GLU_FOUND) | 257 | if (NOT QT_DEP_GLU_FOUND) |
| 258 | message(FATAL_ERROR "Qt bundled pacakge dependency `glu` not found. \ | 258 | message(FATAL_ERROR "Qt bundled pacakge dependency `glu` not found. \ |
| @@ -386,7 +386,7 @@ endif() | |||
| 386 | 386 | ||
| 387 | # Ensure libusb is properly configured (based on dolphin libusb include) | 387 | # Ensure libusb is properly configured (based on dolphin libusb include) |
| 388 | if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB) | 388 | if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB) |
| 389 | include(FindPkgConfig) | 389 | find_package(PkgConfig) |
| 390 | if (PKG_CONFIG_FOUND AND NOT CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD") | 390 | if (PKG_CONFIG_FOUND AND NOT CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD") |
| 391 | pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24) | 391 | pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24) |
| 392 | else() | 392 | else() |
| @@ -410,7 +410,7 @@ set(FFmpeg_COMPONENTS | |||
| 410 | swscale) | 410 | swscale) |
| 411 | 411 | ||
| 412 | if (UNIX AND NOT APPLE) | 412 | if (UNIX AND NOT APPLE) |
| 413 | Include(FindPkgConfig REQUIRED) | 413 | find_package(PkgConfig REQUIRED) |
| 414 | pkg_check_modules(LIBVA libva) | 414 | pkg_check_modules(LIBVA libva) |
| 415 | endif() | 415 | endif() |
| 416 | if (NOT YUZU_USE_BUNDLED_FFMPEG) | 416 | 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) | |||
| 43 | CACHE PATH "Paths to FFmpeg libraries" FORCE) | 43 | CACHE PATH "Paths to FFmpeg libraries" FORCE) |
| 44 | endforeach() | 44 | endforeach() |
| 45 | 45 | ||
| 46 | Include(FindPkgConfig REQUIRED) | 46 | find_package(PkgConfig REQUIRED) |
| 47 | pkg_check_modules(LIBVA libva) | 47 | pkg_check_modules(LIBVA libva) |
| 48 | pkg_check_modules(CUDA cuda) | 48 | pkg_check_modules(CUDA cuda) |
| 49 | pkg_check_modules(FFNVCODEC ffnvcodec) | 49 | 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) | |||
| 108 | target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}") | 108 | target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}") |
| 109 | 109 | ||
| 110 | if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") | 110 | if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
| 111 | Include(FindPkgConfig) | 111 | find_package(PkgConfig) |
| 112 | pkg_check_modules(LIBUDEV REQUIRED libudev) | 112 | pkg_check_modules(LIBUDEV REQUIRED libudev) |
| 113 | 113 | ||
| 114 | if (LIBUDEV_FOUND) | 114 | if (LIBUDEV_FOUND) |