notsoyuzu
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9433 from Tachi107/cmake-is-awful 

build: tweak the find modules even more
This commit is contained in:
liamwhite 2022-12-15 12:05:13 -05:00 committed by GitHub
parent 3ff7a5de1a 4447c9a46e
commit b8c03411e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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

4
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

4
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

4
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

4
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

4
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

4
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