cmake: correct find modules
This commit is contained in:
		
							
								
								
									
										18
									
								
								externals/find-modules/FindOpus.cmake
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								externals/find-modules/FindOpus.cmake
									
									
									
									
										vendored
									
									
								
							| @@ -1,19 +1,17 @@ | ||||
| # SPDX-FileCopyrightText: 2022 yuzu Emulator Project | ||||
| # SPDX-License-Identifier: GPL-2.0-or-later | ||||
|  | ||||
| find_package(PkgConfig) | ||||
|  | ||||
| find_package(PkgConfig QUIET) | ||||
| if (PKG_CONFIG_FOUND) | ||||
|     pkg_search_module(opus IMPORTED_TARGET GLOBAL opus) | ||||
|     if (opus_FOUND) | ||||
|         add_library(Opus::opus ALIAS PkgConfig::opus) | ||||
|     endif() | ||||
|     pkg_search_module(OPUS QUIET IMPORTED_TARGET opus) | ||||
| endif() | ||||
|  | ||||
| include(FindPackageHandleStandardArgs) | ||||
| find_package_handle_standard_args(Opus | ||||
|     REQUIRED_VARS | ||||
|         opus_LINK_LIBRARIES | ||||
|         opus_FOUND | ||||
|     VERSION_VAR opus_VERSION | ||||
|     REQUIRED_VARS OPUS_LINK_LIBRARIES | ||||
|     VERSION_VAR OPUS_VERSION | ||||
| ) | ||||
|  | ||||
| if (Opus_FOUND AND NOT TARGET Opus::opus) | ||||
|     add_library(Opus::opus ALIAS PkgConfig::OPUS) | ||||
| endif() | ||||
|   | ||||
							
								
								
									
										9
									
								
								externals/find-modules/Findenet.cmake
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								externals/find-modules/Findenet.cmake
									
									
									
									
										vendored
									
									
								
							| @@ -4,10 +4,7 @@ | ||||
|  | ||||
| find_package(PkgConfig QUIET) | ||||
| if (PKG_CONFIG_FOUND) | ||||
|     pkg_search_module(ENET QUIET IMPORTED_TARGET GLOBAL libenet) | ||||
|     if (ENET_FOUND) | ||||
|         add_library(enet::enet ALIAS PkgConfig::ENET) | ||||
|     endif() | ||||
|     pkg_search_module(ENET QUIET IMPORTED_TARGET libenet) | ||||
| endif() | ||||
|  | ||||
| include(FindPackageHandleStandardArgs) | ||||
| @@ -15,3 +12,7 @@ find_package_handle_standard_args(enet | ||||
|     REQUIRED_VARS ENET_LINK_LIBRARIES | ||||
|     VERSION_VAR ENET_VERSION | ||||
| ) | ||||
|  | ||||
| if (enet_FOUND AND NOT TARGET enet::enet) | ||||
|     add_library(enet::enet ALIAS PkgConfig::ENET) | ||||
| endif() | ||||
|   | ||||
							
								
								
									
										9
									
								
								externals/find-modules/Findhttplib.cmake
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								externals/find-modules/Findhttplib.cmake
									
									
									
									
										vendored
									
									
								
							| @@ -10,13 +10,14 @@ if (httplib_FOUND) | ||||
| else() | ||||
|     find_package(PkgConfig QUIET) | ||||
|     if (PKG_CONFIG_FOUND) | ||||
|         pkg_search_module(HTTPLIB QUIET IMPORTED_TARGET GLOBAL cpp-httplib) | ||||
|         if (HTTPLIB_FOUND) | ||||
|             add_library(httplib::httplib ALIAS PkgConfig::HTTPLIB) | ||||
|         endif() | ||||
|         pkg_search_module(HTTPLIB QUIET IMPORTED_TARGET cpp-httplib) | ||||
|     endif() | ||||
|     find_package_handle_standard_args(httplib | ||||
|         REQUIRED_VARS HTTPLIB_INCLUDEDIR | ||||
|         VERSION_VAR HTTPLIB_VERSION | ||||
|     ) | ||||
| endif() | ||||
|  | ||||
| if (httplib_FOUND AND NOT TARGET httplib::httplib) | ||||
|     add_library(httplib::httplib ALIAS PkgConfig::HTTPLIB) | ||||
| endif() | ||||
|   | ||||
							
								
								
									
										9
									
								
								externals/find-modules/Findinih.cmake
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								externals/find-modules/Findinih.cmake
									
									
									
									
										vendored
									
									
								
							| @@ -4,10 +4,7 @@ | ||||
|  | ||||
| find_package(PkgConfig QUIET) | ||||
| if (PKG_CONFIG_FOUND) | ||||
|     pkg_search_module(INIREADER QUIET IMPORTED_TARGET GLOBAL INIReader) | ||||
|     if (INIREADER_FOUND) | ||||
|         add_library(inih::INIReader ALIAS PkgConfig::INIREADER) | ||||
|     endif() | ||||
|     pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader) | ||||
| endif() | ||||
|  | ||||
| include(FindPackageHandleStandardArgs) | ||||
| @@ -15,3 +12,7 @@ find_package_handle_standard_args(inih | ||||
|     REQUIRED_VARS INIREADER_LINK_LIBRARIES | ||||
|     VERSION_VAR INIREADER_VERSION | ||||
| ) | ||||
|  | ||||
| if (inih_FOUND AND NOT TARGET inih::INIReader) | ||||
|     add_library(inih::INIReader ALIAS PkgConfig::INIREADER) | ||||
| endif() | ||||
|   | ||||
							
								
								
									
										28
									
								
								externals/find-modules/Findlz4.cmake
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										28
									
								
								externals/find-modules/Findlz4.cmake
									
									
									
									
										vendored
									
									
								
							| @@ -6,25 +6,23 @@ include(FindPackageHandleStandardArgs) | ||||
| find_package(lz4 QUIET CONFIG) | ||||
| if (lz4_FOUND) | ||||
|     find_package_handle_standard_args(lz4 CONFIG_MODE) | ||||
|     if (NOT TARGET lz4::lz4) | ||||
|         if (TARGET LZ4::lz4_shared) | ||||
|             set_target_properties(LZ4::lz4_shared PROPERTIES IMPORTED_GLOBAL TRUE) | ||||
|             add_library(lz4::lz4 ALIAS LZ4::lz4_shared) | ||||
|         else() | ||||
|             set_target_properties(LZ4::lz4_static PROPERTIES IMPORTED_GLOBAL TRUE) | ||||
|             add_library(lz4::lz4 ALIAS LZ4::lz4_static) | ||||
|         endif() | ||||
|     endif() | ||||
| else() | ||||
|     find_package(PkgConfig QUIET) | ||||
|     if (PKG_CONFIG_FOUND) | ||||
|         pkg_search_module(liblz4 QUIET IMPORTED_TARGET GLOBAL liblz4) | ||||
|         if (liblz4_FOUND) | ||||
|             add_library(lz4::lz4 ALIAS PkgConfig::liblz4) | ||||
|         endif() | ||||
|         pkg_search_module(LZ4 QUIET IMPORTED_TARGET liblz4) | ||||
|     endif() | ||||
|     find_package_handle_standard_args(lz4 | ||||
|         REQUIRED_VARS liblz4_LINK_LIBRARIES | ||||
|         VERSION_VAR liblz4_VERSION | ||||
|         REQUIRED_VARS LZ4_LINK_LIBRARIES | ||||
|         VERSION_VAR LZ4_VERSION | ||||
|     ) | ||||
| endif() | ||||
|  | ||||
| if (lz4_FOUND AND NOT TARGET lz4::lz4) | ||||
|     if (TARGET LZ4::lz4_shared) | ||||
|         add_library(lz4::lz4 ALIAS LZ4::lz4_shared) | ||||
|     elseif (TARGET LZ4::lz4_static) | ||||
|         add_library(lz4::lz4 ALIAS LZ4::lz4_static) | ||||
|     else() | ||||
|         add_library(lz4::lz4 ALIAS PkgConfig::LZ4) | ||||
|     endif() | ||||
| endif() | ||||
|   | ||||
							
								
								
									
										28
									
								
								externals/find-modules/Findzstd.cmake
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										28
									
								
								externals/find-modules/Findzstd.cmake
									
									
									
									
										vendored
									
									
								
							| @@ -6,25 +6,23 @@ include(FindPackageHandleStandardArgs) | ||||
| find_package(zstd QUIET CONFIG) | ||||
| if (zstd_FOUND) | ||||
|     find_package_handle_standard_args(zstd CONFIG_MODE) | ||||
|     if (NOT TARGET zstd::zstd) | ||||
|         if (TARGET zstd::libzstd_shared) | ||||
|             set_target_properties(zstd::libzstd_shared PROPERTIES IMPORTED_GLOBAL TRUE) | ||||
|             add_library(zstd::zstd ALIAS zstd::libzstd_shared) | ||||
|         else() | ||||
|             set_target_properties(zstd::libzstd_static PROPERTIES IMPORTED_GLOBAL TRUE) | ||||
|             add_library(zstd::zstd ALIAS zstd::libzstd_static) | ||||
|         endif() | ||||
|     endif() | ||||
| else() | ||||
|     find_package(PkgConfig QUIET) | ||||
|     if (PKG_CONFIG_FOUND) | ||||
|         pkg_search_module(libzstd QUIET IMPORTED_TARGET GLOBAL libzstd) | ||||
|         if (libzstd_FOUND) | ||||
|             add_library(zstd::zstd ALIAS PkgConfig::libzstd) | ||||
|         endif() | ||||
|         pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd) | ||||
|     endif() | ||||
|     find_package_handle_standard_args(zstd | ||||
|         REQUIRED_VARS libzstd_LINK_LIBRARIES | ||||
|         VERSION_VAR libzstd_VERSION | ||||
|         REQUIRED_VARS ZSTD_LINK_LIBRARIES | ||||
|         VERSION_VAR ZSTD_VERSION | ||||
|     ) | ||||
| endif() | ||||
|  | ||||
| if (zstd_FOUND AND NOT TARGET zstd::zstd) | ||||
|     if (TARGET zstd::libzstd_shared) | ||||
|         add_library(zstd::zstd ALIAS zstd::libzstd_shared) | ||||
|     elseif (TARGET zstd::libzstd_static) | ||||
|         add_library(zstd::zstd ALIAS zstd::libzstd_static) | ||||
|     else() | ||||
|         add_library(zstd::zstd ALIAS PkgConfig::ZSTD) | ||||
|     endif() | ||||
| endif() | ||||
|   | ||||
		Reference in New Issue
	
	Block a user