diff options
| author | Ron Economos <w6rz@comcast.net> | 2020-09-25 08:30:12 -0700 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-10-01 06:35:02 -0400 |
| commit | 5fd9d0926906bf8128f3121218462136d0887266 (patch) | |
| tree | 4f214b0ecd443ada08e721c8873461d6c9f8b94e /cmake | |
| parent | 4dc78e62c2241b410d848f1bbb3dfd946622e11a (diff) | |
cmake: Remove "find_package_handle_standard_args" warnings.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindCodec2.cmake | 6 | ||||
| -rw-r--r-- | cmake/Modules/FindFFTW3f.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindGMP.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindGSL.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindGSM.cmake | 6 | ||||
| -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/FindZeroMQ.cmake | 6 |
10 files changed, 33 insertions, 13 deletions
diff --git a/cmake/Modules/FindCodec2.cmake b/cmake/Modules/FindCodec2.cmake index fe472c58b9..2258bc6284 100644 --- a/cmake/Modules/FindCodec2.cmake +++ b/cmake/Modules/FindCodec2.cmake @@ -9,7 +9,9 @@ # Check for system libcodec2 # ############################## -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() INCLUDE(FindPackageHandleStandardArgs) pkg_check_modules(LIBCODEC2_PKG QUIET codec2) @@ -63,7 +65,7 @@ if(LIBCODEC2_INCLUDE_DIR AND LIBCODEC2_LIBRARIES) endif() endif(LIBCODEC2_INCLUDE_DIR AND LIBCODEC2_LIBRARIES) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBCODEC2 DEFAULT_MSG LIBCODEC2_LIBRARIES LIBCODEC2_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Codec2 DEFAULT_MSG LIBCODEC2_LIBRARIES LIBCODEC2_INCLUDE_DIRS) mark_as_advanced(LIBCODEC2_INCLUDE_DIR LIBCODEC2_LIBRARIES) if (LIBCODEC2_FOUND AND NOT TARGET CODEC2::CODEC2) diff --git a/cmake/Modules/FindFFTW3f.cmake b/cmake/Modules/FindFFTW3f.cmake index c375c18823..3d493f89ae 100644 --- a/cmake/Modules/FindFFTW3f.cmake +++ b/cmake/Modules/FindFFTW3f.cmake @@ -3,7 +3,9 @@ # Find single-precision (float) version of FFTW3 -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_FFTW3f "fftw3f >= 3.0") FIND_PATH( diff --git a/cmake/Modules/FindGMP.cmake b/cmake/Modules/FindGMP.cmake index 8782334e80..bb3ce48058 100644 --- a/cmake/Modules/FindGMP.cmake +++ b/cmake/Modules/FindGMP.cmake @@ -1,4 +1,6 @@ -include(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + include(FindPkgConfig) +endif() pkg_check_modules(PC_GMP "gmp") set(GMP_DEFINITIONS ${PC_GMP_CFLAGS_OTHER}) diff --git a/cmake/Modules/FindGSL.cmake b/cmake/Modules/FindGSL.cmake index 60b0d83045..1776eee594 100644 --- a/cmake/Modules/FindGSL.cmake +++ b/cmake/Modules/FindGSL.cmake @@ -16,7 +16,9 @@ # GSL_LINK_DIRECTORIES = link directories, useful for rpath on Unix # GSL_EXE_LINKER_FLAGS = rpath on Unix -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(GSL "gsl >= 1.10") IF(GSL_FOUND) set(GSL_LIBRARY_DIRS ${GSL_LIBDIR}) diff --git a/cmake/Modules/FindGSM.cmake b/cmake/Modules/FindGSM.cmake index 878ddc023f..92898d6320 100644 --- a/cmake/Modules/FindGSM.cmake +++ b/cmake/Modules/FindGSM.cmake @@ -9,7 +9,9 @@ # Check for system libgsm # ########################### -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() INCLUDE(FindPackageHandleStandardArgs) pkg_check_modules(LIBGSM_PKG QUIET gsm) @@ -36,7 +38,7 @@ if(LIBGSM_INCLUDE_DIR AND LIBGSM_LIBRARIES) set(LIBGSM_LIBRARIES ${LIBGSM_LIBRARIES} ${LIBGSM_LIBRARY}) endif(LIBGSM_INCLUDE_DIR AND LIBGSM_LIBRARIES) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGSM DEFAULT_MSG LIBGSM_LIBRARIES LIBGSM_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSM DEFAULT_MSG LIBGSM_LIBRARIES LIBGSM_INCLUDE_DIRS) mark_as_advanced(LIBGSM_INCLUDE_DIR LIBGSM_LIBRARIES) if (LIBGSM_FOUND AND NOT TARGET GSM::GSM) diff --git a/cmake/Modules/FindMPIR.cmake b/cmake/Modules/FindMPIR.cmake index 647b3815a4..1346af4d29 100644 --- a/cmake/Modules/FindMPIR.cmake +++ b/cmake/Modules/FindMPIR.cmake @@ -1,4 +1,6 @@ -include(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + include(FindPkgConfig) +endif() 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 ab18c6c1df..b4fc31cc28 100644 --- a/cmake/Modules/FindPORTAUDIO.cmake +++ b/cmake/Modules/FindPORTAUDIO.cmake @@ -5,7 +5,9 @@ # PORTAUDIO_INCLUDE_DIRS - the Portaudio include directory # PORTAUDIO_LIBRARIES - Link these to use Portaudio -include(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + include(FindPkgConfig) +endif() 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 e20a603efe..56e819a774 100644 --- a/cmake/Modules/FindSNDFILE.cmake +++ b/cmake/Modules/FindSNDFILE.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_SNDFILE "sndfile") FIND_PATH(SNDFILE_INCLUDE_DIRS diff --git a/cmake/Modules/FindTHRIFT.cmake b/cmake/Modules/FindTHRIFT.cmake index 970a9c4c31..c8c2739888 100644 --- a/cmake/Modules/FindTHRIFT.cmake +++ b/cmake/Modules/FindTHRIFT.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_THRIFT thrift) set(THRIFT_REQ_VERSION "0.9.2") diff --git a/cmake/Modules/FindZeroMQ.cmake b/cmake/Modules/FindZeroMQ.cmake index 7be57d932f..5189c6d76f 100644 --- a/cmake/Modules/FindZeroMQ.cmake +++ b/cmake/Modules/FindZeroMQ.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_ZEROMQ "libzmq") FIND_PATH(ZEROMQ_INCLUDE_DIRS @@ -22,7 +24,7 @@ FIND_LIBRARY(ZEROMQ_LIBRARIES ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZEROMQ DEFAULT_MSG ZEROMQ_LIBRARIES ZEROMQ_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZeroMQ DEFAULT_MSG ZEROMQ_LIBRARIES ZEROMQ_INCLUDE_DIRS) MARK_AS_ADVANCED(ZEROMQ_LIBRARIES ZEROMQ_INCLUDE_DIRS) if (ZEROMQ_FOUND AND NOT TARGET ZEROMQ::ZEROMQ) |