etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: tweak the find modules even more

Browse source 
As described in
https://github.com/yuzu-emu/yuzu/pull/9395#discussion_r1047456172
checking for PKG_CONFIG_FOUND before calling pkg_search_module() is
unneeded, and some find modules (like FindFFmpeg.cmake) don't do this
already. Consequently, this patch removes these checks.
This commit is contained in:
Andrea Pappacoda 2022-12-14 09:30:31 +01:00
parent e2f32e8c88
commit 4447c9a46e
No known key found for this signature in database
GPG key ID: 4A9208A2455077A7
7 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
externals/find-modules/FindOpus.cmake vendored
View file

@ -2,9 +2,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND)
pkg_search_module(OPUS QUIET IMPORTED_TARGET opus) pkg_search_module(OPUS QUIET IMPORTED_TARGET opus)
endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Opus find_package_handle_standard_args(Opus

2
externals/find-modules/Findenet.cmake vendored
View file

@ -3,9 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND)
pkg_search_module(ENET QUIET IMPORTED_TARGET libenet) pkg_search_module(ENET QUIET IMPORTED_TARGET libenet)
endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(enet find_package_handle_standard_args(enet

2
externals/find-modules/Findhttplib.cmake vendored
View file

@ -9,9 +9,7 @@ if (httplib_FOUND)
find_package_handle_standard_args(httplib CONFIG_MODE) find_package_handle_standard_args(httplib CONFIG_MODE)
else() else()
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND)
pkg_search_module(HTTPLIB QUIET IMPORTED_TARGET cpp-httplib) pkg_search_module(HTTPLIB QUIET IMPORTED_TARGET cpp-httplib)
endif()
find_package_handle_standard_args(httplib find_package_handle_standard_args(httplib
REQUIRED_VARS HTTPLIB_INCLUDEDIR REQUIRED_VARS HTTPLIB_INCLUDEDIR
VERSION_VAR HTTPLIB_VERSION VERSION_VAR HTTPLIB_VERSION

2
externals/find-modules/Findinih.cmake vendored
View file

@ -3,9 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND)
pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader) pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader)
endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(inih find_package_handle_standard_args(inih

2
externals/find-modules/Findlibusb.cmake vendored
View file

@ -3,9 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND)
pkg_search_module(LIBUSB QUIET IMPORTED_TARGET libusb-1.0) pkg_search_module(LIBUSB QUIET IMPORTED_TARGET libusb-1.0)
endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(libusb find_package_handle_standard_args(libusb

2
externals/find-modules/Findlz4.cmake vendored
View file

@ -8,9 +8,7 @@ if (lz4_FOUND)
find_package_handle_standard_args(lz4 CONFIG_MODE) find_package_handle_standard_args(lz4 CONFIG_MODE)
else() else()
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND)
pkg_search_module(LZ4 QUIET IMPORTED_TARGET liblz4) pkg_search_module(LZ4 QUIET IMPORTED_TARGET liblz4)
endif()
find_package_handle_standard_args(lz4 find_package_handle_standard_args(lz4
REQUIRED_VARS LZ4_LINK_LIBRARIES REQUIRED_VARS LZ4_LINK_LIBRARIES
VERSION_VAR LZ4_VERSION VERSION_VAR LZ4_VERSION

2
externals/find-modules/Findzstd.cmake vendored
View file

@ -8,9 +8,7 @@ if (zstd_FOUND)
find_package_handle_standard_args(zstd CONFIG_MODE) find_package_handle_standard_args(zstd CONFIG_MODE)
else() else()
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND)
pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd) pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd)
endif()
find_package_handle_standard_args(zstd find_package_handle_standard_args(zstd
REQUIRED_VARS ZSTD_LINK_LIBRARIES REQUIRED_VARS ZSTD_LINK_LIBRARIES
VERSION_VAR ZSTD_VERSION VERSION_VAR ZSTD_VERSION