morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[cmake] Locate PkgConfig module with find_package() instead of include(FindPkgConfig)

Browse Source 
This is the contemporary way of including find modules and including the
find module this way avoids cmake errors in conjunction with
find_package_handle_standard_args().

Signed-off-by: Kimon Hoffmann <Kimon.Hoffmann@lawo.com>
This commit is contained in:
Kimon Hoffmann
2023-08-09 12:08:16 +02:00
committed by akallabeth
parent 988dcd49a3
commit 8ec4d20616
13 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindFFmpeg.cmake
View File

@@ -8,7 +8,7 @@
set(REQUIRED_AVCODEC_VERSION 0.8)
set(REQUIRED_AVCODEC_API_VERSION 53.25.0)
include(FindPkgConfig)
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(AVCODEC libavcodec)

1
cmake/FindKRB5.cmake
View File

@@ -167,7 +167,6 @@ endfunction()
#
# * First search with pkg-config (prefer MIT over Heimdal)
# * Then try to find krb5-config (generic, krb5-config.mit and last krb5-config.heimdal)
include(FindPkgConfig)
find_package(PkgConfig REQUIRED)
if (KRB5_ROOT_CONFIG)

2
cmake/FindPCSC.cmake
View File

@@ -4,7 +4,7 @@
# PCSC_INCLUDE_DIRS - pcsc include directories
# PCSC_LIBRARIES - libraries needed for linking
include(FindPkgConfig)
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
pkg_check_modules(PC_PCSC QUIET libpcsclite)

2
cmake/FindPkcs11.cmake
View File

@@ -5,7 +5,7 @@
# PKCS11_INCLUDE_DIRS - combined include directories
# PKCS11_LIBRARIES - combined libraries to link
include(FindPkgConfig)
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(PKCS11 libpkcs11-helper-1)

2
cmake/FindPulse.cmake
View File

@@ -1,5 +1,5 @@
include(FindPkgConfig)
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
pkg_check_modules(PULSE libpulse)

2
cmake/FindSWScale.cmake
View File

@@ -1,5 +1,5 @@
include(FindPkgConfig)
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(SWScale libswscale)

2
cmake/FindWayland.cmake
View File

@@ -25,7 +25,7 @@
# limitations under the License.
#=============================================================================
include(FindPkgConfig)
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
pkg_check_modules(WAYLAND_SCANNER_PC wayland-scanner)