From 8622b1c284b101b784e48b8ff5e697e866667de8 Mon Sep 17 00:00:00 2001 From: Nikita Pushchin Date: Sat, 13 Feb 2021 20:32:23 +0300 Subject: [PATCH] cmake/modules fix --- cmake/modules/FindFFTW3F.cmake | 5 ++--- cmake/modules/FindMbedTLS.cmake | 4 ++-- cmake/modules/FindPCSCLite.cmake | 4 ++-- cmake/modules/FindPolarssl.cmake | 4 ++-- cmake/modules/FindSCTP.cmake | 2 +- cmake/modules/FindUHD.cmake | 3 ++- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/modules/FindFFTW3F.cmake b/cmake/modules/FindFFTW3F.cmake index f498ab57d..11048879a 100644 --- a/cmake/modules/FindFFTW3F.cmake +++ b/cmake/modules/FindFFTW3F.cmake @@ -13,7 +13,7 @@ # FFTW3F_LIBRARIES - The libraries needed to use fftw3f # FFTW3F_DEFINITIONS - Compiler switches required for using fftw3f -find_package(PkgConfig) +find_package(PkgConfig REQUIRED) pkg_check_modules(PC_FFTW3F "fftw3f >= 3.0") set(FFTW3F_DEFINITIONS ${PC_FFTW3F_CFLAGS_OTHER}) @@ -46,7 +46,6 @@ message(STATUS "FFTW3F INCLUDE DIRS: " ${FFTW3F_INCLUDE_DIRS}) include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set FFTW3F_FOUND to TRUE # if all listed variables are TRUE -find_package_handle_standard_args(fftw3f DEFAULT_MSG - FFTW3F_LIBRARY FFTW3F_INCLUDE_DIR) +find_package_handle_standard_args(FFTW3F DEFAULT_MSG FFTW3F_LIBRARY FFTW3F_INCLUDE_DIR) mark_as_advanced(FFTW3F_INCLUDE_DIR FFTW3F_STATIC_LIBRARY FFTW3F_LIBRARY ) diff --git a/cmake/modules/FindMbedTLS.cmake b/cmake/modules/FindMbedTLS.cmake index d8fb3b400..7ac1f3d8b 100644 --- a/cmake/modules/FindMbedTLS.cmake +++ b/cmake/modules/FindMbedTLS.cmake @@ -13,7 +13,7 @@ # MBEDTLS_INCLUDE_DIRS - The mbedtls include directories # MBEDTLS_LIBRARIES - The mbedtls library -INCLUDE(FindPkgConfig) +FIND_PACKAGE(PkgConfig REQUIRED) PKG_CHECK_MODULES(PC_MBEDTLS mbedtls) #find Mbedtls @@ -58,5 +58,5 @@ message(STATUS "MBEDTLS STATIC LIBRARIES: " ${MBEDTLS_STATIC_LIBRARIES}) message(STATUS "MBEDTLS INCLUDE DIRS: " ${MBEDTLS_INCLUDE_DIRS}) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(MBEDTLS DEFAULT_MSG MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MbedTLS DEFAULT_MSG MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS) MARK_AS_ADVANCED(MBEDTLS_LIBRARIES MBEDTLS_STATIC_LIBRARIES MBEDTLS_INCLUDE_DIRS) diff --git a/cmake/modules/FindPCSCLite.cmake b/cmake/modules/FindPCSCLite.cmake index f9257637c..110d8fad4 100644 --- a/cmake/modules/FindPCSCLite.cmake +++ b/cmake/modules/FindPCSCLite.cmake @@ -13,7 +13,7 @@ # PCSCLITE_LIBRARIES - List of libraries when using PCSC-Lite. # PCSCLITE_FOUND - True if PCSC-Lite found. -FIND_PACKAGE(PkgConfig) +FIND_PACKAGE(PkgConfig REQUIRED) PKG_CHECK_MODULES(PC_PCSCLITE libpcsclite) IF(NOT PCSCLITE_FOUND) @@ -41,7 +41,7 @@ FIND_LIBRARY(PCSCLITE_LIBRARY NAMES pcsclite libpcsclite PCSC # handle the QUIETLY and REQUIRED arguments and set PCSCLITE_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCSCLITE DEFAULT_MSG PCSCLITE_LIBRARY PCSCLITE_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCSCLite DEFAULT_MSG PCSCLITE_LIBRARY PCSCLITE_INCLUDE_DIR) IF(PCSCLITE_FOUND) SET(PCSCLITE_LIBRARIES ${PCSCLITE_LIBRARY}) diff --git a/cmake/modules/FindPolarssl.cmake b/cmake/modules/FindPolarssl.cmake index 91d0e528e..54fa89aa1 100644 --- a/cmake/modules/FindPolarssl.cmake +++ b/cmake/modules/FindPolarssl.cmake @@ -13,7 +13,7 @@ # POLARSSL_INCLUDE_DIRS - The polarssl include directories # POLARSSL_LIBRARIES - The polarssl library -INCLUDE(FindPkgConfig) +FIND_PACKAGE(PkgConfig REQUIRED) PKG_CHECK_MODULES(PC_POLARSSL polarssl) FIND_PATH( @@ -57,5 +57,5 @@ message(STATUS "POLARSSL STATIC LIBRARIES: " ${POLARSSL_STATIC_LIBRARIES}) message(STATUS "POLARSSL INCLUDE DIRS: " ${POLARSSL_INCLUDE_DIRS}) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(POLARSSL DEFAULT_MSG POLARSSL_LIBRARIES POLARSSL_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Polarssl DEFAULT_MSG POLARSSL_LIBRARIES POLARSSL_INCLUDE_DIRS) MARK_AS_ADVANCED(POLARSSL_STATIC_LIBRARIES POLARSSL_LIBRARIES POLARSSL_INCLUDE_DIRS) diff --git a/cmake/modules/FindSCTP.cmake b/cmake/modules/FindSCTP.cmake index e32d4d6ed..635584530 100644 --- a/cmake/modules/FindSCTP.cmake +++ b/cmake/modules/FindSCTP.cmake @@ -13,7 +13,7 @@ # SCTP_INCLUDE_DIRS - The mbedtls include directories # SCTP_LIBRARIES - The mbedtls library -INCLUDE(FindPkgConfig) +FIND_PACKAGE(PkgConfig REQUIRED) PKG_CHECK_MODULES(PC_SCTP sctp) #find Mbedtls diff --git a/cmake/modules/FindUHD.cmake b/cmake/modules/FindUHD.cmake index 9a36b52b5..94616b0b3 100644 --- a/cmake/modules/FindUHD.cmake +++ b/cmake/modules/FindUHD.cmake @@ -6,7 +6,8 @@ # the distribution. # -INCLUDE(FindPkgConfig) +FIND_PACKAGE(PkgConfig REQUIRED) + #PKG_CHECK_MODULES(UHD uhd) IF(NOT UHD_FOUND)