diff options
| author | Ron Economos <w6rz@comcast.net> | 2021-09-07 04:13:05 -0700 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2021-09-12 12:42:08 -0700 |
| commit | 9b096690ee2d4d13fa645f7c7e25775b04e41d04 (patch) | |
| tree | 96e418f787c1a7ccf46b0176dab193c03b5e9848 /cmake | |
| parent | 4c6ae3a386ec19698a8c01144c4e8a52fc113404 (diff) | |
cmake: Use preferred method to find PkgConfig.
Signed-off-by: Ron Economos <w6rz@comcast.net>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindCodec2.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindFFTW3f.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindGMP.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindGSM.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindMPIR.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindPORTAUDIO.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindSNDFILE.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindTHRIFT.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindUHD.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindZeroMQ.cmake | 4 |
10 files changed, 10 insertions, 30 deletions
diff --git a/cmake/Modules/FindCodec2.cmake b/cmake/Modules/FindCodec2.cmake index 7525c18043..919e95d392 100644 --- a/cmake/Modules/FindCodec2.cmake +++ b/cmake/Modules/FindCodec2.cmake @@ -9,9 +9,7 @@ # Check for system libcodec2 # ############################## -if(NOT PKG_CONFIG_FOUND) - INCLUDE(FindPkgConfig) -endif() +find_package(PkgConfig) INCLUDE(FindPackageHandleStandardArgs) pkg_check_modules(LIBCODEC2_PKG QUIET codec2) diff --git a/cmake/Modules/FindFFTW3f.cmake b/cmake/Modules/FindFFTW3f.cmake index 3d493f89ae..79c2a054a1 100644 --- a/cmake/Modules/FindFFTW3f.cmake +++ b/cmake/Modules/FindFFTW3f.cmake @@ -3,9 +3,7 @@ # Find single-precision (float) version of FFTW3 -if(NOT PKG_CONFIG_FOUND) - INCLUDE(FindPkgConfig) -endif() +find_package(PkgConfig) PKG_CHECK_MODULES(PC_FFTW3f "fftw3f >= 3.0") FIND_PATH( diff --git a/cmake/Modules/FindGMP.cmake b/cmake/Modules/FindGMP.cmake index bb3ce48058..62f9a43925 100644 --- a/cmake/Modules/FindGMP.cmake +++ b/cmake/Modules/FindGMP.cmake @@ -1,6 +1,4 @@ -if(NOT PKG_CONFIG_FOUND) - include(FindPkgConfig) -endif() +find_package(PkgConfig) pkg_check_modules(PC_GMP "gmp") set(GMP_DEFINITIONS ${PC_GMP_CFLAGS_OTHER}) diff --git a/cmake/Modules/FindGSM.cmake b/cmake/Modules/FindGSM.cmake index 58e86de861..ca01b2ad0b 100644 --- a/cmake/Modules/FindGSM.cmake +++ b/cmake/Modules/FindGSM.cmake @@ -9,9 +9,7 @@ # Check for system libgsm # ########################### -if(NOT PKG_CONFIG_FOUND) - INCLUDE(FindPkgConfig) -endif() +find_package(PkgConfig) INCLUDE(FindPackageHandleStandardArgs) pkg_check_modules(LIBGSM_PKG QUIET gsm) diff --git a/cmake/Modules/FindMPIR.cmake b/cmake/Modules/FindMPIR.cmake index 9735c99e2b..f31714cca2 100644 --- a/cmake/Modules/FindMPIR.cmake +++ b/cmake/Modules/FindMPIR.cmake @@ -1,6 +1,4 @@ -if(NOT PKG_CONFIG_FOUND) - include(FindPkgConfig) -endif() +find_package(PkgConfig) pkg_check_modules(PC_MPIR "mpir >= 3.0") set(MPIR_DEFINITIONS ${PC_MPIR_CFLAGS_OTHER}) diff --git a/cmake/Modules/FindPORTAUDIO.cmake b/cmake/Modules/FindPORTAUDIO.cmake index b4fc31cc28..f01ec4ddca 100644 --- a/cmake/Modules/FindPORTAUDIO.cmake +++ b/cmake/Modules/FindPORTAUDIO.cmake @@ -5,9 +5,7 @@ # PORTAUDIO_INCLUDE_DIRS - the Portaudio include directory # PORTAUDIO_LIBRARIES - Link these to use Portaudio -if(NOT PKG_CONFIG_FOUND) - include(FindPkgConfig) -endif() +find_package(PkgConfig) pkg_check_modules(PC_PORTAUDIO portaudio-2.0) find_path(PORTAUDIO_INCLUDE_DIRS diff --git a/cmake/Modules/FindSNDFILE.cmake b/cmake/Modules/FindSNDFILE.cmake index 56e819a774..14f362d4f6 100644 --- a/cmake/Modules/FindSNDFILE.cmake +++ b/cmake/Modules/FindSNDFILE.cmake @@ -1,6 +1,4 @@ -if(NOT PKG_CONFIG_FOUND) - INCLUDE(FindPkgConfig) -endif() +find_package(PkgConfig) PKG_CHECK_MODULES(PC_SNDFILE "sndfile") FIND_PATH(SNDFILE_INCLUDE_DIRS diff --git a/cmake/Modules/FindTHRIFT.cmake b/cmake/Modules/FindTHRIFT.cmake index 8e0e1519a2..be7d813245 100644 --- a/cmake/Modules/FindTHRIFT.cmake +++ b/cmake/Modules/FindTHRIFT.cmake @@ -1,6 +1,4 @@ -if(NOT PKG_CONFIG_FOUND) - INCLUDE(FindPkgConfig) -endif() +find_package(PkgConfig) PKG_CHECK_MODULES(PC_THRIFT thrift) set(THRIFT_REQ_VERSION ${THRIFT_FIND_VERSION}) diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index aba1e5bc8e..4b3dfd6b60 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -53,9 +53,7 @@ if(NOT "$ENV{UHD_CONFIG_VERSION_USED}" STREQUAL "TRUE") # Not used; try the "old" method (not as robust) - if(NOT PKG_CONFIG_FOUND) - include(FindPkgConfig) - endif(NOT PKG_CONFIG_FOUND) + find_package(PkgConfig) pkg_check_modules(PC_UHD uhd) find_path( diff --git a/cmake/Modules/FindZeroMQ.cmake b/cmake/Modules/FindZeroMQ.cmake index 5189c6d76f..eba9cdca82 100644 --- a/cmake/Modules/FindZeroMQ.cmake +++ b/cmake/Modules/FindZeroMQ.cmake @@ -1,6 +1,4 @@ -if(NOT PKG_CONFIG_FOUND) - INCLUDE(FindPkgConfig) -endif() +find_package(PkgConfig) PKG_CHECK_MODULES(PC_ZEROMQ "libzmq") FIND_PATH(ZEROMQ_INCLUDE_DIRS |