From 25fd448c56364d63ef77053e66802b9d724c1d44 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 26 Jul 2019 02:04:42 +0200 Subject: [PATCH] Fixed cmake find modules HINTS and PATHS for dependencies that can be compiled locally --- cmake/Modules/FindCM256cc.cmake | 14 +++++++------- cmake/Modules/FindCodec2.cmake | 14 +++++++------- cmake/Modules/FindLZ4.cmake | 20 +++++++++----------- cmake/Modules/FindLibAIRSPY.cmake | 14 +++++++------- cmake/Modules/FindLibAIRSPYHF.cmake | 14 +++++++------- cmake/Modules/FindLibBLADERF.cmake | 16 ++++++++-------- cmake/Modules/FindLibDSDcc.cmake | 14 +++++++------- cmake/Modules/FindLibHACKRF.cmake | 14 +++++++------- cmake/Modules/FindLibIIO.cmake | 16 ++++++++-------- cmake/Modules/FindLibMbe.cmake | 14 +++++++------- cmake/Modules/FindLibMiriSDR.cmake | 14 +++++++------- cmake/Modules/FindLibOsmoSDR.cmake | 14 ++++++-------- cmake/Modules/FindLibPerseus.cmake | 8 ++++---- cmake/Modules/FindLibRTLSDR.cmake | 14 +++++++------- cmake/Modules/FindLibXTRX.cmake | 18 +++++++++--------- cmake/Modules/FindLimeSuite.cmake | 10 +++++----- cmake/Modules/FindSerialDV.cmake | 8 ++++---- cmake/Modules/FindSoapySDR.cmake | 26 +++++++++++++------------- 18 files changed, 129 insertions(+), 133 deletions(-) diff --git a/cmake/Modules/FindCM256cc.cmake b/cmake/Modules/FindCM256cc.cmake index 43e95eb08..4c6bab685 100644 --- a/cmake/Modules/FindCM256cc.cmake +++ b/cmake/Modules/FindCM256cc.cmake @@ -3,21 +3,21 @@ PKG_CHECK_MODULES(PC_CM256cc "libcm256cc") FIND_PATH(CM256CC_INCLUDE_DIR NAMES cm256cc/cm256.h - HINTS ${PC_CM256CC_INCLUDE_DIR} + HINTS ${CM256CC_DIR}/include + ${PC_CM256CC_INCLUDE_DIR} ${CMAKE_INSTALL_PREFIX}/include - PATHS ${CM256CC_DIR}/include - /usr/local/include + PATHS /usr/local/include /usr/include ) FIND_LIBRARY(CM256CC_LIBRARIES NAMES cm256cc libcm256cc - HINTS ${PC_CM256CC_LIBDIR} + HINTS ${CM256CC_DIR}/lib + ${CM256CC_DIR}/lib64 + ${PC_CM256CC_LIBDIR} ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 - PATHS ${CM256CC_DIR}/lib - ${CM256CC_DIR}/lib64 - /usr/local/lib + PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 diff --git a/cmake/Modules/FindCodec2.cmake b/cmake/Modules/FindCodec2.cmake index 8e31a0764..2d4dd4db9 100644 --- a/cmake/Modules/FindCodec2.cmake +++ b/cmake/Modules/FindCodec2.cmake @@ -3,21 +3,21 @@ PKG_CHECK_MODULES(PC_CODEC2 "codec2") FIND_PATH(CODEC2_INCLUDE_DIR NAMES codec2/codec2.h - HINTS ${PC_CODEC2_INCLUDE_DIR} + HINTS ${CODEC2_DIR}/include + ${PC_CODEC2_INCLUDE_DIR} ${CMAKE_INSTALL_PREFIX}/include - PATHS ${CODEC2_DIR}/include - /usr/local/include + PATHS /usr/local/include /usr/include ) FIND_LIBRARY(CODEC2_LIBRARIES NAMES codec2 libcodec2 - HINTS ${PC_CODEC2_LIBDIR} + HINTS ${CODEC2_DIR}/lib + ${CODEC2_DIR}/lib64 + ${PC_CODEC2_LIBDIR} ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 - PATHS ${CODEC2_DIR}/lib - ${CODEC2_DIR}/lib64 - /usr/local/lib + PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 diff --git a/cmake/Modules/FindLZ4.cmake b/cmake/Modules/FindLZ4.cmake index b40d8bcd2..98b74c865 100644 --- a/cmake/Modules/FindLZ4.cmake +++ b/cmake/Modules/FindLZ4.cmake @@ -4,22 +4,20 @@ PKG_CHECK_MODULES(PC_LZ4 "liblz4") FIND_PATH(LZ4_INCLUDE_DIRS NAMES lz4.h HINTS ${PC_LZ4_INCLUDE_DIR} - ${CMAKE_INSTALL_PREFIX}/include - ${LIBLZ4_INSTALL_PREFIX}/include - PATHS - /usr/local/include - /usr/include + ${CMAKE_INSTALL_PREFIX}/include + ${LIBLZ4_INSTALL_PREFIX}/include + PATHS /usr/local/include + /usr/include ) FIND_LIBRARY(LZ4_LIBRARIES NAMES lz4 liblz4 HINTS ${PC_LZ4_LIBDIR} - ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 - PATHS - ${LZ4_INCLUDE_DIRS}/../lib - /usr/local/lib - /usr/lib + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 + PATHS ${LZ4_INCLUDE_DIRS}/../lib + /usr/local/lib + /usr/lib ) if (LZ4_LIBRARIES AND LZ4_INCLUDE_DIRS) diff --git a/cmake/Modules/FindLibAIRSPY.cmake b/cmake/Modules/FindLibAIRSPY.cmake index 525d4f035..f324ca2b7 100644 --- a/cmake/Modules/FindLibAIRSPY.cmake +++ b/cmake/Modules/FindLibAIRSPY.cmake @@ -1,20 +1,20 @@ if(NOT LIBAIRSPY_FOUND) pkg_check_modules (LIBAIRSPY_PKG libairspy) - - find_path(LIBAIRSPY_INCLUDE_DIR + + find_path(LIBAIRSPY_INCLUDE_DIR NAMES libairspy/airspy.h - PATHS ${AIRSPY_DIR}/include + HINTS ${AIRSPY_DIR}/include ${LIBAIRSPY_PKG_INCLUDE_DIRS} - /usr/include + PATHS /usr/include /usr/local/include ) - find_library(LIBAIRSPY_LIBRARIES + find_library(LIBAIRSPY_LIBRARIES NAMES airspy - PATHS ${AIRSPY_DIR}/lib + HINTS ${AIRSPY_DIR}/lib ${LIBAIRSPY_PKG_LIBRARY_DIRS} - /usr/lib + PATHS /usr/lib /usr/local/lib ) diff --git a/cmake/Modules/FindLibAIRSPYHF.cmake b/cmake/Modules/FindLibAIRSPYHF.cmake index 866123242..d8379eb74 100644 --- a/cmake/Modules/FindLibAIRSPYHF.cmake +++ b/cmake/Modules/FindLibAIRSPYHF.cmake @@ -1,20 +1,20 @@ if(NOT LIBAIRSPYHF_FOUND) pkg_check_modules (LIBAIRSPYHF_PKG libairspyhf) - - find_path(LIBAIRSPYHF_INCLUDE_DIR + + find_path(LIBAIRSPYHF_INCLUDE_DIR NAMES libairspyhf/airspyhf.h - PATHS ${AIRSPYHF_DIR}/include + HINTS ${AIRSPYHF_DIR}/include ${LIBAIRSPYHF_PKG_INCLUDE_DIRS} - /usr/include + PATHS /usr/include /usr/local/include ) - find_library(LIBAIRSPYHF_LIBRARIES + find_library(LIBAIRSPYHF_LIBRARIES NAMES airspyhf - PATHS ${AIRSPYHF_DIR}/lib + HINTS ${AIRSPYHF_DIR}/lib ${LIBAIRSPYHF_PKG_LIBRARY_DIRS} - /usr/lib + PATHS /usr/lib /usr/local/lib ) diff --git a/cmake/Modules/FindLibBLADERF.cmake b/cmake/Modules/FindLibBLADERF.cmake index 6c61124c4..62891794c 100644 --- a/cmake/Modules/FindLibBLADERF.cmake +++ b/cmake/Modules/FindLibBLADERF.cmake @@ -5,18 +5,18 @@ if(NOT LIBBLADERF_FOUND) if(LIBBLADERF_PKG_FOUND OR (DEFINED BLADERF_DIR)) find_path(LIBBLADERF_INCLUDE_DIRS NAMES libbladeRF.h - PATHS ${BLADERF_DIR}/include - ${LIBBLADERF_PKG_INCLUDE_DIRS} - /usr/include - /usr/local/include + HINTS ${BLADERF_DIR}/include + ${LIBBLADERF_PKG_INCLUDE_DIRS} + PATHS /usr/include + /usr/local/include ) find_library(LIBBLADERF_LIBRARIES NAMES bladeRF - PATHS ${BLADERF_DIR}/lib - ${LIBBLADERF_PKG_LIBRARY_DIRS} - /usr/lib - /usr/local/lib + HINTS ${BLADERF_DIR}/lib + ${LIBBLADERF_PKG_LIBRARY_DIRS} + PATHS /usr/lib + /usr/local/lib ) if(LIBBLADERF_INCLUDE_DIRS AND LIBBLADERF_LIBRARIES) diff --git a/cmake/Modules/FindLibDSDcc.cmake b/cmake/Modules/FindLibDSDcc.cmake index a7fb016b0..9d73028de 100644 --- a/cmake/Modules/FindLibDSDcc.cmake +++ b/cmake/Modules/FindLibDSDcc.cmake @@ -3,21 +3,21 @@ if(NOT LIBDSDCC_FOUND) pkg_check_modules(LIBDSDCC_PKG libdsdcc) - - find_path(LIBDSDCC_INCLUDE_DIR + + find_path(LIBDSDCC_INCLUDE_DIR NAMES dsdcc/dsd_decoder.h - PATHS ${DSDCC_DIR}/include + HINTS ${DSDCC_DIR}/include ${LIBDSDCC_PKG_INCLUDE_DIRS} - /usr/include/dsdcc + PATHS /usr/include/dsdcc /usr/local/include/dsdcc ) - find_library(LIBDSDCC_LIBRARIES + find_library(LIBDSDCC_LIBRARIES NAMES dsdcc - PATHS ${DSDCC_DIR}/lib + HINTS ${DSDCC_DIR}/lib ${DSDCC_DIR}/lib64 ${LIBDSDCC_PKG_LIBRARY_DIRS} - /usr/lib + PATHS /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 diff --git a/cmake/Modules/FindLibHACKRF.cmake b/cmake/Modules/FindLibHACKRF.cmake index 557d4b03b..88a6056b1 100644 --- a/cmake/Modules/FindLibHACKRF.cmake +++ b/cmake/Modules/FindLibHACKRF.cmake @@ -1,20 +1,20 @@ if(NOT LIBHACKRF_FOUND) pkg_check_modules (LIBHACKRF_PKG libhackrf) - - find_path(LIBHACKRF_INCLUDE_DIR + + find_path(LIBHACKRF_INCLUDE_DIR NAMES libhackrf/hackrf.h - PATHS ${HACKRF_DIR}/include + HINTS ${HACKRF_DIR}/include ${LIBHACKRF_PKG_INCLUDE_DIRS} - /usr/include + PATHS /usr/include /usr/local/include ) - find_library(LIBHACKRF_LIBRARIES + find_library(LIBHACKRF_LIBRARIES NAMES hackrf - PATHS ${HACKRF_DIR}/lib + HINTS ${HACKRF_DIR}/lib ${LIBHACKRF_PKG_LIBRARY_DIRS} - /usr/lib + PATHS /usr/lib /usr/local/lib ) diff --git a/cmake/Modules/FindLibIIO.cmake b/cmake/Modules/FindLibIIO.cmake index 33cbb92bd..29bb5d8c9 100644 --- a/cmake/Modules/FindLibIIO.cmake +++ b/cmake/Modules/FindLibIIO.cmake @@ -5,18 +5,18 @@ if(NOT LIBIIO_FOUND) if(LIBIIO_PKG_FOUND OR (DEFINED IIO_DIR)) find_path(LIBIIO_INCLUDE_DIR NAMES iio.h - PATHS ${IIO_DIR}/include - ${LIBIIO_PKG_INCLUDE_DIRS} - /usr/include - /usr/local/include + HINTS ${IIO_DIR}/include + ${LIBIIO_PKG_INCLUDE_DIRS} + PATHS /usr/include + /usr/local/include ) find_library(LIBIIO_LIBRARIES NAMES iio - PATHS ${IIO_DIR}/lib - ${LIBIIO_PKG_LIBRARY_DIRS} - /usr/lib - /usr/local/lib + HINTS ${IIO_DIR}/lib + ${LIBIIO_PKG_LIBRARY_DIRS} + PATHS /usr/lib + /usr/local/lib ) if(LIBIIO_INCLUDE_DIR AND LIBIIO_LIBRARIES) diff --git a/cmake/Modules/FindLibMbe.cmake b/cmake/Modules/FindLibMbe.cmake index 86e10cd55..cc65d7116 100644 --- a/cmake/Modules/FindLibMbe.cmake +++ b/cmake/Modules/FindLibMbe.cmake @@ -1,18 +1,18 @@ # Find libmbe -find_path(LIBMBE_INCLUDE_DIR +find_path(LIBMBE_INCLUDE_DIR NAMES mbelib.h - PATHS ${MBE_DIR}/include - /usr/include + HINTS ${MBE_DIR}/include + PATHS /usr/include /usr/local/include ) set(LIBMBE_NAMES ${LIBMBE_NAMES} mbe libmbe) -find_library(LIBMBE_LIBRARY - NAMES ${LIBMBE_NAMES} - PATHS ${MBE_DIR}/lib - /usr/include +find_library(LIBMBE_LIBRARY + NAMES ${LIBMBE_NAMES} + HINTS ${MBE_DIR}/lib + PATHS /usr/include /usr/local/include ) diff --git a/cmake/Modules/FindLibMiriSDR.cmake b/cmake/Modules/FindLibMiriSDR.cmake index f83147d29..2a4b75574 100644 --- a/cmake/Modules/FindLibMiriSDR.cmake +++ b/cmake/Modules/FindLibMiriSDR.cmake @@ -1,20 +1,20 @@ if(NOT LIBMIRISDR_FOUND) pkg_check_modules (LIBMIRISDR_PKG libmirisdr) - - find_path(LIBMIRISDR_INCLUDE_DIR + + find_path(LIBMIRISDR_INCLUDE_DIR NAMES mirisdr.h - PATHS ${MIRISDR_DIR}/include + HINTS ${MIRISDR_DIR}/include ${LIBMIRISDR_PKG_INCLUDE_DIRS} - /usr/include + PATHS /usr/include /usr/local/include ) - find_library(LIBMIRISDR_LIBRARIES + find_library(LIBMIRISDR_LIBRARIES NAMES mirisdr - PATHS ${MIRISDR_DIR}/lib + HINTS ${MIRISDR_DIR}/lib ${LIBMIRISDR_PKG_LIBRARY_DIRS} - /usr/lib + PATHS /usr/lib /usr/local/lib ) diff --git a/cmake/Modules/FindLibOsmoSDR.cmake b/cmake/Modules/FindLibOsmoSDR.cmake index ba0c77df7..d2c6b58bd 100644 --- a/cmake/Modules/FindLibOsmoSDR.cmake +++ b/cmake/Modules/FindLibOsmoSDR.cmake @@ -2,17 +2,15 @@ if(NOT LIBOSMOSDR_FOUND) pkg_check_modules (LIBOSMOSDR_PKG libosmosdr) find_path(LIBOSMOSDR_INCLUDE_DIR NAMES osmosdr.h - PATHS - ${LIBOSMOSDR_PKG_INCLUDE_DIRS} - /usr/include - /usr/local/include + HINTS ${LIBOSMOSDR_PKG_INCLUDE_DIRS} + PATHS /usr/include + /usr/local/include ) find_library(LIBOSMOSDR_LIBRARIES NAMES osmosdr - PATHS - ${LIBOSMOSDR_PKG_LIBRARY_DIRS} - /usr/lib - /usr/local/lib + HINTS ${LIBOSMOSDR_PKG_LIBRARY_DIRS} + PATHS /usr/lib + /usr/local/lib ) if(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES) diff --git a/cmake/Modules/FindLibPerseus.cmake b/cmake/Modules/FindLibPerseus.cmake index ff696bbe0..241bb6937 100644 --- a/cmake/Modules/FindLibPerseus.cmake +++ b/cmake/Modules/FindLibPerseus.cmake @@ -4,18 +4,18 @@ if(NOT LIBPERSEUS_FOUND) find_path(LIBPERSEUS_INCLUDE_DIR NAMES perseus-sdr.h - PATHS ${PERSEUS_DIR}/include + HINTS ${PERSEUS_DIR}/include ${LIBPERSEUS_PKG_INCLUDE_DIRS} - /usr/include + PATHS /usr/include /usr/local/include ) find_library(LIBPERSEUS_LIBRARIES NAMES perseus-sdr - PATHS ${PERSEUS_DIR}/lib + HINTS ${PERSEUS_DIR}/lib ${PERSEUS_DIR}/lib64 ${LIBPERSEUS_PKG_LIBRARY_DIRS} - /usr/lib + PATHS /usr/lib /usr/local/lib ) diff --git a/cmake/Modules/FindLibRTLSDR.cmake b/cmake/Modules/FindLibRTLSDR.cmake index 0fe24ac2b..95211a365 100644 --- a/cmake/Modules/FindLibRTLSDR.cmake +++ b/cmake/Modules/FindLibRTLSDR.cmake @@ -1,20 +1,20 @@ if(NOT LIBRTLSDR_FOUND) pkg_check_modules (LIBRTLSDR_PKG librtlsdr) - - find_path(LIBRTLSDR_INCLUDE_DIR + + find_path(LIBRTLSDR_INCLUDE_DIR NAMES rtl-sdr.h - PATHS ${RTLSDR_DIR}/include + HINTS ${RTLSDR_DIR}/include ${LIBRTLSDR_PKG_INCLUDE_DIRS} - /usr/include + PATHS /usr/include /usr/local/include ) - find_library(LIBRTLSDR_LIBRARIES + find_library(LIBRTLSDR_LIBRARIES NAMES rtlsdr - PATHS ${RTLSDR_DIR}/lib + HINTS ${RTLSDR_DIR}/lib ${LIBRTLSDR_PKG_LIBRARY_DIRS} - /usr/lib + PATHS /usr/lib /usr/local/lib ) diff --git a/cmake/Modules/FindLibXTRX.cmake b/cmake/Modules/FindLibXTRX.cmake index d13634898..8bcd8286a 100644 --- a/cmake/Modules/FindLibXTRX.cmake +++ b/cmake/Modules/FindLibXTRX.cmake @@ -1,21 +1,21 @@ if(NOT LIBXTRX_FOUND) - + pkg_check_modules (LIBXTRX_PKG libxtrx) - - find_path(LIBXTRX_INCLUDE_DIRS + + find_path(LIBXTRX_INCLUDE_DIRS NAMES xtrx_api.h - PATHS ${XTRX_DIR}/include + HINTS ${XTRX_DIR}/include ${LIBXTRX_PKG_INCLUDE_DIRS} - /usr/include + PATHS /usr/include /usr/local/include ) - + find_library(LIBXTRX_LIBRARY NAMES xtrx - HINTS ${CMAKE_INSTALL_PREFIX}/lib + HINTS ${XTRX_DIR}/lib + ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 - PATHS ${XTRX_DIR}/lib - /usr/local/lib + PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 diff --git a/cmake/Modules/FindLimeSuite.cmake b/cmake/Modules/FindLimeSuite.cmake index 41ca966d1..d7ea7f41e 100644 --- a/cmake/Modules/FindLimeSuite.cmake +++ b/cmake/Modules/FindLimeSuite.cmake @@ -3,8 +3,8 @@ if (NOT LIMESUITE_INCLUDE_DIR) find_path (LIMESUITE_INCLUDE_DIR NAMES lime/LimeSuite.h - PATHS ${LIMESUITE_DIR}/include - /usr/include + HINTS ${LIMESUITE_DIR}/include + PATHS /usr/include /usr/local/include ) endif() @@ -12,10 +12,10 @@ endif() if (NOT LIMESUITE_LIBRARY) find_library (LIMESUITE_LIBRARY NAMES LimeSuite - HINTS ${CMAKE_INSTALL_PREFIX}/lib + HINTS ${LIMESUITE_DIR}/lib + ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 - PATHS ${LIMESUITE_DIR}/lib - /usr/local/lib + PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 diff --git a/cmake/Modules/FindSerialDV.cmake b/cmake/Modules/FindSerialDV.cmake index c23e3d008..e4c40b00a 100644 --- a/cmake/Modules/FindSerialDV.cmake +++ b/cmake/Modules/FindSerialDV.cmake @@ -2,8 +2,8 @@ find_path(LIBSERIALDV_INCLUDE_DIR NAMES dvcontroller.h - PATHS ${SERIALDV_DIR}/include/serialdv - /usr/include/serialdv + HINTS ${SERIALDV_DIR}/include/serialdv + PATHS /usr/include/serialdv /usr/local/include/serialdv ) @@ -11,8 +11,8 @@ set(LIBSERIAL_NAMES ${LIBSERIAL_NAMES} serialdv libserialdv) find_library(LIBSERIALDV_LIBRARY NAMES serialdv - PATHS ${SERIALDV_DIR}/lib - /usr/lib + HINTS ${SERIALDV_DIR}/lib + PATHS /usr/lib /usr/local/lib ) diff --git a/cmake/Modules/FindSoapySDR.cmake b/cmake/Modules/FindSoapySDR.cmake index 77fe95ec9..534c8aff4 100644 --- a/cmake/Modules/FindSoapySDR.cmake +++ b/cmake/Modules/FindSoapySDR.cmake @@ -15,23 +15,23 @@ if(NOT SOAPYSDR_FOUND) find_path (SOAPYSDR_INCLUDE_DIR NAMES SoapySDR/Version.h - PATHS ${SOAPYSDR_DIR}/include - ${LIBSOAPYSDR_PKG_INCLUDE_DIRS} - /usr/include - /usr/local/include + HINTS ${SOAPYSDR_DIR}/include + ${LIBSOAPYSDR_PKG_INCLUDE_DIRS} + PATHS /usr/include + /usr/local/include ) find_library (SOAPYSDR_LIBRARY NAMES SoapySDR - HINTS ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 - PATHS ${SOAPYSDR_DIR}/lib - ${SOAPYSDR_DIR}/lib64 - ${LIBSOAPYSDR_PKG_LIBRARY_DIRS} - /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 + HINTS ${SOAPYSDR_DIR}/lib + ${SOAPYSDR_DIR}/lib64 + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 + ${LIBSOAPYSDR_PKG_LIBRARY_DIRS} + PATHS /usr/local/lib + /usr/local/lib64 + /usr/lib + /usr/lib64 ) if (SOAPYSDR_INCLUDE_DIR AND SOAPYSDR_LIBRARY)