From fe6ba544c537151d16cf00700ce8b2069980caf5 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Thu, 15 Dec 2022 19:29:31 +0100 Subject: [PATCH] early-access version 3217 --- README.md | 2 +- externals/find-modules/FindOpus.cmake | 4 +--- externals/find-modules/Findenet.cmake | 4 +--- externals/find-modules/Findhttplib.cmake | 4 +--- externals/find-modules/Findinih.cmake | 4 +--- externals/find-modules/Findlibusb.cmake | 4 +--- externals/find-modules/Findlz4.cmake | 4 +--- externals/find-modules/Findzstd.cmake | 4 +--- 8 files changed, 8 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e1e6cee78..0e3675181 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3216. +This is the source code for early-access 3217. ## Legal Notice diff --git a/externals/find-modules/FindOpus.cmake b/externals/find-modules/FindOpus.cmake index e0764b316..d75e332fd 100755 --- a/externals/find-modules/FindOpus.cmake +++ b/externals/find-modules/FindOpus.cmake @@ -2,9 +2,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later find_package(PkgConfig QUIET) -if (PKG_CONFIG_FOUND) - pkg_search_module(OPUS QUIET IMPORTED_TARGET opus) -endif() +pkg_search_module(OPUS QUIET IMPORTED_TARGET opus) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Opus diff --git a/externals/find-modules/Findenet.cmake b/externals/find-modules/Findenet.cmake index 6dae76f4c..859a6f386 100755 --- a/externals/find-modules/Findenet.cmake +++ b/externals/find-modules/Findenet.cmake @@ -3,9 +3,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later find_package(PkgConfig QUIET) -if (PKG_CONFIG_FOUND) - pkg_search_module(ENET QUIET IMPORTED_TARGET libenet) -endif() +pkg_search_module(ENET QUIET IMPORTED_TARGET libenet) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(enet diff --git a/externals/find-modules/Findhttplib.cmake b/externals/find-modules/Findhttplib.cmake index b72bad076..4d17cb393 100755 --- a/externals/find-modules/Findhttplib.cmake +++ b/externals/find-modules/Findhttplib.cmake @@ -9,9 +9,7 @@ if (httplib_FOUND) find_package_handle_standard_args(httplib CONFIG_MODE) else() find_package(PkgConfig QUIET) - if (PKG_CONFIG_FOUND) - pkg_search_module(HTTPLIB QUIET IMPORTED_TARGET cpp-httplib) - endif() + pkg_search_module(HTTPLIB QUIET IMPORTED_TARGET cpp-httplib) find_package_handle_standard_args(httplib REQUIRED_VARS HTTPLIB_INCLUDEDIR VERSION_VAR HTTPLIB_VERSION diff --git a/externals/find-modules/Findinih.cmake b/externals/find-modules/Findinih.cmake index 8d1a07243..b8d38dcff 100755 --- a/externals/find-modules/Findinih.cmake +++ b/externals/find-modules/Findinih.cmake @@ -3,9 +3,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later find_package(PkgConfig QUIET) -if (PKG_CONFIG_FOUND) - pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader) -endif() +pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(inih diff --git a/externals/find-modules/Findlibusb.cmake b/externals/find-modules/Findlibusb.cmake index 66f61001c..0eadce957 100755 --- a/externals/find-modules/Findlibusb.cmake +++ b/externals/find-modules/Findlibusb.cmake @@ -3,9 +3,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later find_package(PkgConfig QUIET) -if (PKG_CONFIG_FOUND) - pkg_search_module(LIBUSB QUIET IMPORTED_TARGET libusb-1.0) -endif() +pkg_search_module(LIBUSB QUIET IMPORTED_TARGET libusb-1.0) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(libusb diff --git a/externals/find-modules/Findlz4.cmake b/externals/find-modules/Findlz4.cmake index da39f5918..ceb409167 100755 --- a/externals/find-modules/Findlz4.cmake +++ b/externals/find-modules/Findlz4.cmake @@ -8,9 +8,7 @@ if (lz4_FOUND) find_package_handle_standard_args(lz4 CONFIG_MODE) else() find_package(PkgConfig QUIET) - if (PKG_CONFIG_FOUND) - pkg_search_module(LZ4 QUIET IMPORTED_TARGET liblz4) - endif() + pkg_search_module(LZ4 QUIET IMPORTED_TARGET liblz4) find_package_handle_standard_args(lz4 REQUIRED_VARS LZ4_LINK_LIBRARIES VERSION_VAR LZ4_VERSION diff --git a/externals/find-modules/Findzstd.cmake b/externals/find-modules/Findzstd.cmake index 8ed94e94d..7f73935c6 100755 --- a/externals/find-modules/Findzstd.cmake +++ b/externals/find-modules/Findzstd.cmake @@ -8,9 +8,7 @@ if (zstd_FOUND) find_package_handle_standard_args(zstd CONFIG_MODE) else() find_package(PkgConfig QUIET) - if (PKG_CONFIG_FOUND) - pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd) - endif() + pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd) find_package_handle_standard_args(zstd REQUIRED_VARS ZSTD_LINK_LIBRARIES VERSION_VAR ZSTD_VERSION