From 3c5f4ca3e4f708533120631420cd305231df357a Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 30 Sep 2019 14:58:34 +0200 Subject: [PATCH] Use canonical order in CMake modules --- CMakeLists.txt | 12 ++++--- cmake/Modules/FindGFLAGS.cmake | 14 ++++---- cmake/Modules/FindGFORTRAN.cmake | 5 +-- cmake/Modules/FindGLOG.cmake | 24 +++++++------ cmake/Modules/FindGNURADIO.cmake | 55 ++++++++++++++++------------- cmake/Modules/FindGOOGLETEST.cmake | 5 +-- cmake/Modules/FindGPERFTOOLS.cmake | 34 ++++++++++++------ cmake/Modules/FindGRDBFCTTC.cmake | 20 ++++++----- cmake/Modules/FindGRGN3S.cmake | 22 ++++++------ cmake/Modules/FindGRIIO.cmake | 33 +++++++++-------- cmake/Modules/FindGROSMOSDR.cmake | 13 ++++--- cmake/Modules/FindLIBIIO.cmake | 23 ++++++------ cmake/Modules/FindLOG4CPP.cmake | 18 +++++----- cmake/Modules/FindMATIO.cmake | 16 ++++++--- cmake/Modules/FindORC.cmake | 19 ++++++---- cmake/Modules/FindPCAP.cmake | 23 ++++++++---- cmake/Modules/FindPUGIXML.cmake | 16 ++++----- cmake/Modules/FindTELEORBIT.cmake | 20 +++++------ cmake/Modules/FindUHD.cmake | 21 ++++++----- cmake/Modules/FindVOLK.cmake | 22 ++++++------ cmake/Modules/FindVOLKGNSSSDR.cmake | 20 ++++++----- 21 files changed, 253 insertions(+), 182 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c13f8713..bf0f50472 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1511,12 +1511,11 @@ else() DESCRIPTION "Transport Layer Security Library" ) endif() -find_library(GNUTLS_OPENSSL_LIBRARY NAMES gnutls-openssl libgnutls-openssl.so.27 - HINTS /usr/lib +find_library(GNUTLS_OPENSSL_LIBRARY + NAMES gnutls-openssl libgnutls-openssl.so.27 + PATHS + /usr/lib /usr/lib64 - /usr/local/lib - /usr/local/lib64 - /opt/local/lib /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu /usr/lib/arm-linux-gnueabihf @@ -1542,6 +1541,9 @@ find_library(GNUTLS_OPENSSL_LIBRARY NAMES gnutls-openssl libgnutls-openssl.so.27 /usr/lib/sparc64-linux-gnu /usr/lib/x86_64-linux-gnux32 /usr/lib/sh4-linux-gnu + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ) if(NOT GNUTLS_OPENSSL_LIBRARY) if(GnuTLS_FOUND) diff --git a/cmake/Modules/FindGFLAGS.cmake b/cmake/Modules/FindGFLAGS.cmake index 70fb63016..1dbce8b89 100644 --- a/cmake/Modules/FindGFLAGS.cmake +++ b/cmake/Modules/FindGFLAGS.cmake @@ -40,8 +40,8 @@ if(APPLE) find_path(GFlags_ROOT_DIR libgflags.dylib PATHS - /opt/local/lib /usr/local/lib + /opt/local/lib ${GFLAGS_ROOT}/lib $ENV{GFLAGS_ROOT}/lib ) @@ -49,7 +49,8 @@ else() find_path(GFlags_ROOT_DIR libgflags.so HINTS - /usr/local/lib + /usr/lib + /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/arm-linux-gnueabihf @@ -74,8 +75,9 @@ else() /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu - /usr/lib64 - /usr/lib + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ${GFLAGS_ROOT}/lib $ENV{GFLAGS_ROOT}/lib ${GFLAGS_ROOT}/lib64 @@ -88,9 +90,9 @@ if(GFlags_ROOT_DIR) find_path(GFlags_INCLUDE_DIRS gflags/gflags.h HINTS - /opt/local/include - /usr/local/include /usr/include + /usr/local/include + /opt/local/include ${GFlags_ROOT_DIR}/src ${GFLAGS_ROOT}/include $ENV{GFLAGS_ROOT}/include diff --git a/cmake/Modules/FindGFORTRAN.cmake b/cmake/Modules/FindGFORTRAN.cmake index ff0ba00da..68bbf1d07 100644 --- a/cmake/Modules/FindGFORTRAN.cmake +++ b/cmake/Modules/FindGFORTRAN.cmake @@ -22,8 +22,6 @@ endif() find_library(GFORTRAN NAMES gfortran PATHS /usr/lib /usr/lib64 - /usr/local/lib - /usr/local/lib/i386 /usr/lib/gcc/x86_64-linux-gnu /usr/lib/gcc/i686-linux-gnu /usr/lib/gcc/i386-linux-gnu @@ -205,6 +203,9 @@ find_library(GFORTRAN NAMES gfortran /usr/lib/gcc/x86_64-linux-gnux32/9 /usr/lib/gcc/x86_64-kfreebsd-gnu/9 /usr/lib/gcc/i686-kfreebsd-gnu/9 + /usr/local/lib + /usr/local/lib64 + /usr/local/lib/i386 ${GFORTRAN_ROOT}/lib $ENV{GFORTRAN_ROOT}/lib ) diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index 4bbb381fb..d398b6099 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -52,8 +52,10 @@ pkg_check_modules(PC_GLOG libglog) macro(_FIND_GLOG_LIBRARIES _var) find_library(${_var} NAMES ${ARGN} + HINTS ${PC_GLOG_LIBDIR} PATHS ${LIB_PATHS} - /usr/local/lib + /usr/lib + /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/arm-linux-gnueabihf @@ -78,14 +80,13 @@ macro(_FIND_GLOG_LIBRARIES _var) /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu - /usr/lib64 - /usr/lib + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ${GLOG_ROOT}/lib $ENV{GLOG_ROOT}/lib ${GLOG_ROOT}/lib64 $ENV{GLOG_ROOT}/lib64 - ${PC_GLOG_LIBDIR} - /opt/local/lib PATH_SUFFIXES lib ) mark_as_advanced(${_var}) @@ -102,19 +103,22 @@ endmacro() if(MSVC) find_path(GLOG_INCLUDE_DIR NAMES raw_logging.h + HINTS + ${PC_GLOG_INCLUDEDIR} PATHS ${GLOG_ROOT}/src/windows ${GLOG_ROOT}/src/windows/glog - ${PC_GLOG_INCLUDEDIR} ) else() # Linux/OS X builds find_path(GLOG_INCLUDE_DIR NAMES raw_logging.h - PATHS - ${GLOG_ROOT}/include/glog - /usr/include/glog - /opt/local/include/glog # default location in Macports + HINTS ${PC_GLOG_INCLUDEDIR} + PATHS + /usr/include/glog + /usr/local/include/glog + /opt/local/include/glog # default location in Macports + ${GLOG_ROOT}/include/glog ) endif() diff --git a/cmake/Modules/FindGNURADIO.cmake b/cmake/Modules/FindGNURADIO.cmake index 980a50c9e..5a9ef650c 100644 --- a/cmake/Modules/FindGNURADIO.cmake +++ b/cmake/Modules/FindGNURADIO.cmake @@ -72,28 +72,25 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) # look for include files find_path(${INCVAR_NAME} NAMES ${INCFILE} - HINTS $ENV{GNURADIO_RUNTIME_DIR}/include - ${PC_INCDIR} - ${CMAKE_INSTALL_PREFIX}/include - ${GNURADIO_INSTALL_PREFIX}/include - PATHS /usr/local/include - /usr/include + HINTS ${PC_INCDIR} + PATHS /usr/include + /usr/local/include + /opt/local/include ${GNURADIO_INSTALL_PREFIX}/include ${GNURADIO_ROOT}/include $ENV{GNURADIO_ROOT}/include + $ENV{GNURADIO_RUNTIME_DIR}/include + ${CMAKE_INSTALL_PREFIX}/include + ${GNURADIO_INSTALL_PREFIX}/include ) # look for libs foreach(libname ${PC_GNURADIO_${EXTVAR}_LIBRARIES}) find_library(${LIBVAR_NAME}_${libname} NAMES ${libname} ${libname}-${PC_GNURADIO_RUNTIME_VERSION} - HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib - ${PC_LIBDIR} - ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 - ${GNURADIO_INSTALL_PREFIX}/lib - ${GNURADIO_INSTALL_PREFIX}/lib64 - PATHS /usr/local/lib + HINTS ${PC_LIBDIR} + PATHS /usr/lib + /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/arm-linux-gnueabihf @@ -118,13 +115,19 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu - /usr/lib64 - /usr/lib + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ${GNURADIO_INSTALL_PREFIX}/lib ${GNURADIO_ROOT}/lib $ENV{GNURADIO_ROOT}/lib ${GNURADIO_ROOT}/lib64 $ENV{GNURADIO_ROOT}/lib64 + $ENV{GNURADIO_RUNTIME_DIR}/lib + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 + ${GNURADIO_INSTALL_PREFIX}/lib + ${GNURADIO_INSTALL_PREFIX}/lib64 ) list(APPEND ${LIBVAR_NAME} ${${LIBVAR_NAME}_${libname}}) endforeach() @@ -208,14 +211,15 @@ endif() if(NOT PC_GNURADIO_RUNTIME_VERSION) find_file(GNURADIO_VERSION_GREATER_THAN_373 NAMES gnuradio/blocks/tsb_vector_sink_f.h - HINTS $ENV{GNURADIO_RUNTIME_DIR}/include - ${CMAKE_INSTALL_PREFIX}/include - ${GNURADIO_INSTALL_PREFIX}/include - PATHS /usr/local/include - /usr/include + PATHS /usr/include + /usr/local/include + /opt/local/include ${GNURADIO_INSTALL_PREFIX}/include ${GNURADIO_ROOT}/include $ENV{GNURADIO_ROOT}/include + $ENV{GNURADIO_RUNTIME_DIR}/include + ${CMAKE_INSTALL_PREFIX}/include + ${GNURADIO_INSTALL_PREFIX}/include ) if(GNURADIO_VERSION_GREATER_THAN_373) set(PC_GNURADIO_RUNTIME_VERSION "3.7.4+") @@ -223,14 +227,15 @@ if(NOT PC_GNURADIO_RUNTIME_VERSION) find_file(GNURADIO_VERSION_GREATER_THAN_38 NAMES gnuradio/filter/mmse_resampler_cc.h - HINTS $ENV{GNURADIO_RUNTIME_DIR}/include - ${CMAKE_INSTALL_PREFIX}/include - ${GNURADIO_INSTALL_PREFIX}/include - PATHS /usr/local/include - /usr/include + PATHS /usr/include + /usr/local/include + /opt/local/include ${GNURADIO_INSTALL_PREFIX}/include ${GNURADIO_ROOT}/include $ENV{GNURADIO_ROOT}/include + $ENV{GNURADIO_RUNTIME_DIR}/include + ${CMAKE_INSTALL_PREFIX}/include + ${GNURADIO_INSTALL_PREFIX}/include ) if(GNURADIO_VERSION_GREATER_THAN_38) set(PC_GNURADIO_RUNTIME_VERSION "3.8.0+") diff --git a/cmake/Modules/FindGOOGLETEST.cmake b/cmake/Modules/FindGOOGLETEST.cmake index b81c17eb3..19a03299e 100644 --- a/cmake/Modules/FindGOOGLETEST.cmake +++ b/cmake/Modules/FindGOOGLETEST.cmake @@ -40,19 +40,20 @@ find_path(LIBGTEST_DEV_DIR ${GTEST_DIR} ${GTEST_DIR}/googletest /usr/src/googletest/googletest - /usr/local/src/googletest/googletest /usr/src/gtest /usr/include/gtest + /usr/local/src/googletest/googletest /opt/local/src/gtest-1.7.0 ) find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h + HINTS ${PC_GTEST_INCLUDEDIR} PATHS ${GTEST_DIR}/googletest/include /usr/include + /usr/local/include /opt/local/src/gtest-1.7.0/include - ${PC_GTEST_INCLUDEDIR} ) include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindGPERFTOOLS.cmake b/cmake/Modules/FindGPERFTOOLS.cmake index 455164b26..bdc1d683f 100644 --- a/cmake/Modules/FindGPERFTOOLS.cmake +++ b/cmake/Modules/FindGPERFTOOLS.cmake @@ -46,43 +46,55 @@ endif() find_library(GPERFTOOLS_TCMALLOC NAMES tcmalloc - HINTS ${Gperftools_ROOT_DIR}/lib + HINTS /usr/lib + /usr/lib64 + /usr/local/lib + /usr/local/lib64 + /opt/local/lib + ${Gperftools_ROOT_DIR}/lib ${GPERFTOOLS_ROOT}/lib $ENV{GPERFTOOLS_ROOT}/lib ${GPERFTOOLS_ROOT}/lib64 $ENV{GPERFTOOLS_ROOT}/lib64 - /usr/lib - /usr/lib64 + ) find_library(GPERFTOOLS_PROFILER NAMES profiler - HINTS ${Gperftools_ROOT_DIR}/lib + HINTS /usr/lib + /usr/lib64 + /usr/local/lib + /usr/local/lib64 + /opt/local/lib + ${Gperftools_ROOT_DIR}/lib ${GPERFTOOLS_ROOT}/lib $ENV{GPERFTOOLS_ROOT}/lib ${GPERFTOOLS_ROOT}/lib64 $ENV{GPERFTOOLS_ROOT}/lib64 - /usr/lib - /usr/lib64 ) find_library(GPERFTOOLS_TCMALLOC_AND_PROFILER NAMES tcmalloc_and_profiler - HINTS ${Gperftools_ROOT_DIR}/lib + HINTS /usr/lib + /usr/lib64 + ${Gperftools_ROOT_DIR}/lib ${GPERFTOOLS_ROOT}/lib $ENV{GPERFTOOLS_ROOT}/lib ${GPERFTOOLS_ROOT}/lib64 $ENV{GPERFTOOLS_ROOT}/lib64 - /usr/lib - /usr/lib64 + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ) find_path(GPERFTOOLS_INCLUDE_DIR NAMES gperftools/heap-profiler.h - HINTS ${Gperftools_ROOT_DIR}/include + HINTS /usr/include + /usr/local/include + /opt/local/include + ${Gperftools_ROOT_DIR}/include ${GPERFTOOLS_ROOT}/include $ENV{GPERFTOOLS_ROOT}/include - /usr/include ) set(GPERFTOOLS_LIBRARIES ${GPERFTOOLS_TCMALLOC_AND_PROFILER}) diff --git a/cmake/Modules/FindGRDBFCTTC.cmake b/cmake/Modules/FindGRDBFCTTC.cmake index 81cd9869b..ba0da622d 100644 --- a/cmake/Modules/FindGRDBFCTTC.cmake +++ b/cmake/Modules/FindGRDBFCTTC.cmake @@ -26,30 +26,32 @@ pkg_check_modules(PC_GR_DBFCTTC gr-dbfcttc) find_path( GR_DBFCTTC_INCLUDE_DIRS NAMES dbfcttc/api.h - HINTS $ENV{GR_DBFCTTC_DIR}/include - ${PC_GR_DBFCTTC_INCLUDEDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/include - /usr/include + HINTS ${PC_GR_DBFCTTC_INCLUDEDIR} + PATHS /usr/include /usr/local/include + /opt/local/include + ${CMAKE_INSTALL_PREFIX}/include ${GRDBFCTTC_ROOT}/include $ENV{GRDBFCTTC_ROOT}/include + $ENV{GR_DBFCTTC_DIR}/include ) find_library( GR_DBFCTTC_LIBRARIES NAMES gnuradio-dbfcttc - HINTS $ENV{GR_DBFCTTC_DIR}/lib - ${PC_GR_DBFCTTC_LIBDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 - /usr/lib + HINTS ${PC_GR_DBFCTTC_LIBDIR} + PATHS /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 + /opt/local/lib + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 ${GRDBFCTTC_ROOT}/lib $ENV{GRDBFCTTC_ROOT}/lib ${GRDBFCTTC_ROOT}/lib64 $ENV{GRDBFCTTC_ROOT}/lib64 + $ENV{GR_DBFCTTC_DIR}/lib ) include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindGRGN3S.cmake b/cmake/Modules/FindGRGN3S.cmake index 8b407544b..de716638c 100644 --- a/cmake/Modules/FindGRGN3S.cmake +++ b/cmake/Modules/FindGRGN3S.cmake @@ -26,30 +26,32 @@ pkg_check_modules(PC_GR_GN3S gr-gn3s) find_path( GR_GN3S_INCLUDE_DIRS NAMES gn3s/gn3s_api.h - HINTS $ENV{GR_GN3S_DIR}/include - ${PC_GR_GN3S_INCLUDEDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/include + HINTS ${PC_GR_GN3S_INCLUDEDIR} + PATHS /usr/include /usr/local/include - /usr/include + /opt/local/include + ${CMAKE_INSTALL_PREFIX}/include ${GRGN3S_ROOT}/include $ENV{GRGN3S_ROOT}/include + $ENV{GR_GN3S_DIR}/include ) find_library( GR_GN3S_LIBRARIES NAMES gr-gn3s - HINTS $ENV{GR_GN3S_DIR}/lib - ${PC_GR_GN3S_LIBDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 + HINTS ${PC_GR_GN3S_LIBDIR} + PATHS /usr/lib + /usr/lib64 /usr/local/lib /usr/local/lib64 - /usr/lib - /usr/lib64 + /opt/local/lib + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 ${GRGN3S_ROOT}/lib $ENV{GRGN3S_ROOT}/lib ${GRGN3S_ROOT}/lib64 $ENV{GRGN3S_ROOT}/lib64 + $ENV{GR_GN3S_DIR}/lib ) include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindGRIIO.cmake b/cmake/Modules/FindGRIIO.cmake index 641d6ba45..5da7c11d3 100644 --- a/cmake/Modules/FindGRIIO.cmake +++ b/cmake/Modules/FindGRIIO.cmake @@ -30,13 +30,14 @@ pkg_check_modules(PC_IIO gnuradio-iio) find_path(IIO_INCLUDE_DIRS NAMES gnuradio/iio/api.h - HINTS $ENV{IIO_DIR}/include - ${PC_IIO_INCLUDEDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/include + HINTS ${PC_IIO_INCLUDEDIR} + PATHS /usr/include /usr/local/include - /usr/include + /opt/local/include + ${CMAKE_INSTALL_PREFIX}/include ${GRIIO_ROOT}/include $ENV{GRIIO_ROOT}/include + $ENV{IIO_DIR}/include ) if(IIO_INCLUDE_DIRS) @@ -44,26 +45,22 @@ if(IIO_INCLUDE_DIRS) else() find_path(IIO_INCLUDE_DIRS NAMES iio/api.h - HINTS $ENV{IIO_DIR}/include - ${PC_IIO_INCLUDEDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/include + HINTS ${PC_IIO_INCLUDEDIR} + PATHS /usr/include /usr/local/include - /usr/include + /opt/local/include + ${CMAKE_INSTALL_PREFIX}/include ${GRIIO_ROOT}/include $ENV{GRIIO_ROOT}/include + $ENV{IIO_DIR}/include ) set(GR_IIO_INCLUDE_HAS_GNURADIO FALSE) endif() find_library(IIO_LIBRARIES NAMES gnuradio-iio - HINTS $ENV{IIO_DIR}/lib - ${PC_IIO_LIBDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 - /usr/local/lib - /usr/local/lib64 - /usr/lib + HINTS ${PC_IIO_LIBDIR} + PATHS /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu @@ -89,10 +86,16 @@ find_library(IIO_LIBRARIES /usr/lib/sparc64-linux-gnu /usr/lib/x86_64-linux-gnux32 /usr/lib/sh4-linux-gnu + /usr/local/lib + /usr/local/lib64 + /opt/local/lib + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 ${GRIIO_ROOT}/lib $ENV{GRIIO_ROOT}/lib ${GRIIO_ROOT}/lib64 $ENV{GRIIO_ROOT}/lib64 + $ENV{IIO_DIR}/lib ) include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindGROSMOSDR.cmake b/cmake/Modules/FindGROSMOSDR.cmake index abfc504ba..dbe25b0e4 100644 --- a/cmake/Modules/FindGROSMOSDR.cmake +++ b/cmake/Modules/FindGROSMOSDR.cmake @@ -50,21 +50,23 @@ find_path(GROSMOSDR_INCLUDE_DIR NAMES osmosdr/source.h osmosdr/api.h + HINTS + ${GROSMOSDR_PKG_INCLUDEDIR} PATHS /usr/include /usr/local/include /opt/local/include ${GROSMOSDR_ROOT}/include $ENV{GROSMOSDR_ROOT}/include - ${GROSMOSDR_PKG_INCLUDEDIR} ) find_library(GROSMOSDR_LIBRARIES NAMES gnuradio-osmosdr + HINTS + ${GROSMOSDR_PKG_LIBDIR} PATHS /usr/lib - /usr/local/lib - /opt/local/lib + /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/arm-linux-gnueabihf @@ -89,12 +91,13 @@ find_library(GROSMOSDR_LIBRARIES /usr/lib/x86_64-linux-gnux32 /usr/lib/riscv64-linux-gnu /usr/lib/alpha-linux-gnu - /usr/lib64 + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ${GROSMOSDR_ROOT}/lib $ENV{GROSMOSDR_ROOT}/lib ${GROSMOSDR_ROOT}/lib64 $ENV{GROSMOSDR_ROOT}/lib64 - ${GROSMOSDR_PKG_LIBDIR} ) include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindLIBIIO.cmake b/cmake/Modules/FindLIBIIO.cmake index 2c8fd96dc..18f1ded73 100644 --- a/cmake/Modules/FindLIBIIO.cmake +++ b/cmake/Modules/FindLIBIIO.cmake @@ -31,26 +31,21 @@ pkg_check_modules(PC_LIBIIO libiio) find_path( LIBIIO_INCLUDE_DIRS NAMES iio.h - HINTS $ENV{LIBIIO_DIR}/include - ${PC_LIBIIO_INCLUDEDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/include + HINTS ${PC_LIBIIO_INCLUDEDIR} + PATHS /usr/include /usr/local/include - /usr/include /opt/local/include + ${CMAKE_INSTALL_PREFIX}/include ${LIBIIO_ROOT}/include $ENV{LIBIIO_ROOT}/include + $ENV{LIBIIO_DIR}/include ) find_library( LIBIIO_LIBRARIES NAMES iio libiio.so.0 - HINTS $ENV{LIBIIO_DIR}/lib - ${PC_LIBIIO_LIBDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 - /usr/local/lib - /usr/local/lib64 - /usr/lib + HINTS ${PC_LIBIIO_LIBDIR} + PATHS /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu @@ -76,11 +71,17 @@ find_library( /usr/lib/x86_64-linux-gnux32 /usr/lib/sh4-linux-gnu /usr/lib/riscv64-linux-gnu + /usr/local/lib + /usr/local/lib64 + /opt/local/lib /Library/Frameworks/iio.framework/ + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 ${LIBIIO_ROOT}/lib $ENV{LIBIIO_ROOT}/lib ${LIBIIO_ROOT}/lib64 $ENV{LIBIIO_ROOT}/lib64 + $ENV{LIBIIO_DIR}/lib ) if(LIBIIO_LIBRARIES AND APPLE) diff --git a/cmake/Modules/FindLOG4CPP.cmake b/cmake/Modules/FindLOG4CPP.cmake index 76c104b26..da07c6aa1 100644 --- a/cmake/Modules/FindLOG4CPP.cmake +++ b/cmake/Modules/FindLOG4CPP.cmake @@ -40,9 +40,9 @@ if(LOG4CPP_INCLUDE_DIR) endif() find_path(LOG4CPP_INCLUDE_DIR log4cpp/Category.hh - /opt/local/include - /usr/local/include /usr/include + /usr/local/include + /opt/local/include ${LOG4CPP_ROOT}/include $ENV{LOG4CPP_ROOT}/include ${PC_LOG4CPP_INCLUDEDIR} @@ -65,11 +65,9 @@ endif() set(LOG4CPP_NAMES log4cpp) find_library(LOG4CPP_LIBRARY NAMES ${LOG4CPP_NAMES} - HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib - ${PC_LOG4CPP_LIBDIR} - ${CMAKE_INSTALL_PREFIX}/lib/ - PATHS /usr/local/lib - /usr/local/lib64 + HINTS ${PC_LOG4CPP_LIBDIR} + PATHS /usr/lib + /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/arm-linux-gnueabihf @@ -94,13 +92,15 @@ find_library(LOG4CPP_LIBRARY /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu - /usr/lib64 - /usr/lib + /usr/local/lib + /usr/local/lib64 /opt/local/lib ${LOG4CPP_ROOT}/lib $ENV{LOG4CPP_ROOT}/lib ${LOG4CPP_ROOT}/lib64 $ENV{LOG4CPP_ROOT}/lib64 + $ENV{GNURADIO_RUNTIME_DIR}/lib + ${CMAKE_INSTALL_PREFIX}/lib ) if(LOG4CPP_INCLUDE_DIR AND LOG4CPP_LIBRARY) diff --git a/cmake/Modules/FindMATIO.cmake b/cmake/Modules/FindMATIO.cmake index fc9296506..7c586c972 100644 --- a/cmake/Modules/FindMATIO.cmake +++ b/cmake/Modules/FindMATIO.cmake @@ -70,6 +70,9 @@ endif() find_path(MATIO_INCLUDE_DIR NAMES matio.h HINTS + /usr/include + /usr/local/include + /opt/local/include ${MATIO_ROOT}/include $ENV{MATIO_ROOT}/include DOC "The MATIO include directory" @@ -79,10 +82,8 @@ find_path(MATIO_INCLUDE_DIR find_library(MATIO_LIBRARY NAMES matio HINTS - ${MATIO_ROOT}/lib - $ENV{MATIO_ROOT}/lib - ${MATIO_ROOT}/lib64 - $ENV{MATIO_ROOT}/lib64 + /usr/lib + /usr/lib64 /usr/lib/alpha-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu @@ -104,6 +105,13 @@ find_library(MATIO_LIBRARY /usr/lib/x86_64-linux-gnux32 /usr/lib/x86_64-kfreebsd-gnu /usr/lib/i386-kfreebsd-gnu + /usr/local/lib + /usr/local/lib64 + /opt/local/lib + ${MATIO_ROOT}/lib + $ENV{MATIO_ROOT}/lib + ${MATIO_ROOT}/lib64 + $ENV{MATIO_ROOT}/lib64 DOC "The MATIO library" ) diff --git a/cmake/Modules/FindORC.cmake b/cmake/Modules/FindORC.cmake index 353264663..d2b98969f 100644 --- a/cmake/Modules/FindORC.cmake +++ b/cmake/Modules/FindORC.cmake @@ -25,21 +25,28 @@ pkg_check_modules(PC_ORC "orc-0.4 > 0.4.22") find_program(ORCC_EXECUTABLE orcc HINTS ${PC_ORC_TOOLSDIR} - PATHS ${ORC_ROOT}/bin + PATHS /usr/bin + /usr/local/bin + /opt/local/bin + ${ORC_ROOT}/bin ${CMAKE_INSTALL_PREFIX}/bin ) find_path(ORC_INCLUDE_DIR NAMES orc/orc.h HINTS ${PC_ORC_INCLUDEDIR} - PATHS ${ORC_ROOT}/include/orc-0.4 + PATHS /usr/include + /usr/local/include + /opt/local/include + ${ORC_ROOT}/include/orc-0.4 ${CMAKE_INSTALL_PREFIX}/include/orc-0.4 ) find_path(ORC_LIBRARY_DIR NAMES ${CMAKE_SHARED_LIBRARY_PREFIX}orc-0.4${CMAKE_SHARED_LIBRARY_SUFFIX} HINTS ${PC_ORC_LIBDIR} - /usr/local/lib + PATHS /usr/lib + /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/arm-linux-gnueabihf @@ -53,11 +60,11 @@ find_path(ORC_LIBRARY_DIR /usr/lib/powerpc64le-linux-gnu /usr/lib/hppa-linux-gnu /usr/lib/s390x-linux-gnu - /usr/lib64 - /usr/lib + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ${ORC_ROOT}/lib $ENV{ORC_ROOT}/lib - PATHS ${ORC_ROOT}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} ) diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake index 3f0faa4e4..90332731e 100644 --- a/cmake/Modules/FindPCAP.cmake +++ b/cmake/Modules/FindPCAP.cmake @@ -61,21 +61,23 @@ if(EXISTS $ENV{PCAPDIR}) NAMES pcap/pcap.h pcap.h + HINTS + ${PC_PCAP_INCLUDEDIR} PATHS $ENV{PCAPDIR} ${PCAP_ROOT}/include $ENV{PCAP_ROOT}/include - ${PC_PCAP_INCLUDEDIR} NO_DEFAULT_PATH ) find_library(PCAP_LIBRARY NAMES pcap + HINTS + ${PC_PCAP_LIBDIR} PATHS $ENV{PCAPDIR} ${PCAP_ROOT}/lib $ENV{PCAP_ROOT}/lib - ${PC_PCAP_LIBDIR} NO_DEFAULT_PATH ) else() @@ -84,18 +86,22 @@ else() pcap/pcap.h pcap.h HINTS + ${PC_PCAP_INCLUDEDIR} + PATHS + /usr/include + /usr/local/include + /opt/local/include ${PCAP_ROOT}/include $ENV{PCAP_ROOT}/include - ${PC_PCAP_INCLUDEDIR} - /usr/include ) find_library(PCAP_LIBRARY NAMES pcap HINTS - ${PCAP_ROOT}/lib - $ENV{PCAP_ROOT}/lib ${PC_PCAP_LIBDIR} + PATHS + /usr/lib + /usr/lib64 /usr/lib/alpha-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu @@ -117,6 +123,11 @@ else() /usr/lib/x86_64-linux-gnux32 /usr/lib/x86_64-kfreebsd-gnu /usr/lib/i386-kfreebsd-gnu + /usr/local/lib + /usr/local/lib64 + /opt/local/lib + ${PCAP_ROOT}/lib + $ENV{PCAP_ROOT}/lib ) endif() diff --git a/cmake/Modules/FindPUGIXML.cmake b/cmake/Modules/FindPUGIXML.cmake index 01d2009b3..a7e2efe10 100644 --- a/cmake/Modules/FindPUGIXML.cmake +++ b/cmake/Modules/FindPUGIXML.cmake @@ -37,24 +37,26 @@ pkg_check_modules(PC_PUGIXML pugixml QUIET) find_path(PUGIXML_INCLUDE_DIR NAMES pugixml.hpp - PATHS ${PUGIXML_HOME}/include - /usr/include + HINTS ${PC_PUGIXML_INCLUDEDIR} + PATHS /usr/include /usr/local/include /usr/local/include/pugixml-${PC_PUGIXML_VERSION} /usr/local/include/pugixml-1.9 /opt/local/include + ${PUGIXML_HOME}/include ${PUGIXML_ROOT}/include $ENV{PUGIXML_ROOT}/include ${PUGIXML_ROOT}/include/pugixml-${PC_PUGIXML_VERSION} $ENV{PUGIXML_ROOT}/include/pugixml-${PC_PUGIXML_VERSION} ${PUGIXML_ROOT}/include/pugixml-1.9 $ENV{PUGIXML_ROOT}/include/pugixml-1.9 - ${PC_PUGIXML_INCLUDEDIR} ) find_library(PUGIXML_LIBRARY NAMES pugixml - PATHS ${PUGIXML_HOME}/lib + HINTS ${PC_PUGIXML_LIBDIR} + PATHS /usr/lib + /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu /usr/lib/arm-linux-gnueabi @@ -78,12 +80,11 @@ find_library(PUGIXML_LIBRARY /usr/lib/x86_64-kfreebsd-gnu /usr/lib/i386-kfreebsd-gnu /usr/local/lib + /usr/local/lib64 /usr/local/lib/pugixml-${PC_PUGIXML_VERSION} /usr/local/lib/pugixml-1.9 /opt/local/lib - /usr/lib - /usr/lib64 - /usr/local/lib64 + ${PUGIXML_HOME}/lib ${PUGIXML_ROOT}/lib $ENV{PUGIXML_ROOT}/lib ${PUGIXML_ROOT}/lib64 @@ -96,7 +97,6 @@ find_library(PUGIXML_LIBRARY $ENV{PUGIXML_ROOT}/lib/pugixml-1.9 ${PUGIXML_ROOT}/lib64/pugixml-1.9 $ENV{PUGIXML_ROOT}/lib64/pugixml-1.9 - ${PC_PUGIXML_LIBDIR} ) # Support the REQUIRED and QUIET arguments, and set PUGIXML_FOUND if found. diff --git a/cmake/Modules/FindTELEORBIT.cmake b/cmake/Modules/FindTELEORBIT.cmake index e26f54c60..5440753a9 100644 --- a/cmake/Modules/FindTELEORBIT.cmake +++ b/cmake/Modules/FindTELEORBIT.cmake @@ -25,31 +25,31 @@ pkg_check_modules(PC_TELEORBIT teleorbit QUIET) find_path(TELEORBIT_INCLUDE_DIRS NAMES teleorbit/api.h - HINTS $ENV{TELEORBIT_DIR}/include - ${PC_TELEORBIT_INCLUDEDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/include + HINTS ${PC_TELEORBIT_INCLUDEDIR} + PATHS /usr/include /usr/local/include - /usr/include /opt/local/include + ${CMAKE_INSTALL_PREFIX}/include ${TELEORBIT_ROOT}/include $ENV{TELEORBIT_ROOT}/include + $ENV{TELEORBIT_DIR}/include ) find_library(TELEORBIT_LIBRARIES NAMES gnuradio-teleorbit - HINTS $ENV{TELEORBIT_DIR}/lib - ${PC_TELEORBIT_LIBDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 + HINTS ${PC_TELEORBIT_LIBDIR} + PATHS /usr/lib + /usr/lib64 /usr/local/lib /usr/local/lib64 - /usr/lib - /usr/lib64 /opt/local/lib + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 ${TELEORBIT_ROOT}/lib $ENV{TELEORBIT_ROOT}/lib ${TELEORBIT_ROOT}/lib64 $ENV{TELEORBIT_ROOT}/lib64 + $ENV{TELEORBIT_DIR}/lib ) include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index 576afdc8d..eb3cb437a 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -33,20 +33,21 @@ pkg_check_modules(PC_UHD uhd) find_path(UHD_INCLUDE_DIRS NAMES uhd/config.hpp - HINTS $ENV{UHD_DIR}/include - ${PC_UHD_INCLUDEDIR} - PATHS /usr/local/include - /usr/include + HINTS ${PC_UHD_INCLUDEDIR} + PATHS /usr/include + /usr/local/include + /opt/local/include ${GNURADIO_INSTALL_PREFIX}/include ${UHD_ROOT}/include $ENV{UHD_ROOT}/include + $ENV{UHD_DIR}/include ) find_library(UHD_LIBRARIES NAMES uhd - HINTS $ENV{UHD_DIR}/lib - ${PC_UHD_LIBDIR} - PATHS /usr/local/lib + HINTS ${PC_UHD_LIBDIR} + PATHS /usr/lib + /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/arm-linux-gnueabihf @@ -71,13 +72,15 @@ find_library(UHD_LIBRARIES /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu - /usr/lib64 - /usr/lib + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ${GNURADIO_INSTALL_PREFIX}/lib ${UHD_ROOT}/lib $ENV{UHD_ROOT}/lib ${UHD_ROOT}/lib64 $ENV{UHD_ROOT}/lib64 + $ENV{UHD_DIR}/lib ) include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindVOLK.cmake b/cmake/Modules/FindVOLK.cmake index 306bfef9f..2fce0f26b 100644 --- a/cmake/Modules/FindVOLK.cmake +++ b/cmake/Modules/FindVOLK.cmake @@ -33,22 +33,21 @@ pkg_check_modules(PC_VOLK volk QUIET) find_path(VOLK_INCLUDE_DIRS NAMES volk/volk.h - HINTS $ENV{VOLK_DIR}/include - ${PC_VOLK_INCLUDEDIR} - PATHS /usr/local/include - /usr/include + HINTS ${PC_VOLK_INCLUDEDIR} + PATHS /usr/include + /usr/local/include + /opt/local/include ${CMAKE_INSTALL_PREFIX}/include ${VOLK_ROOT}/include $ENV{VOLK_ROOT}/include + $ENV{VOLK_DIR}/include ) find_library(VOLK_LIBRARIES NAMES volk - HINTS $ENV{VOLK_DIR}/lib - ${PC_VOLK_LIBDIR} - PATHS /usr/local/lib - /usr/local/lib64 - /usr/lib + HINTS ${PC_VOLK_LIBDIR} + PATHS /usr/lib + /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/arm-linux-gnueabihf @@ -72,12 +71,15 @@ find_library(VOLK_LIBRARIES /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu - /usr/lib64 + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ${CMAKE_INSTALL_PREFIX}/lib ${VOLK_ROOT}/lib $ENV{VOLK_ROOT}/lib ${VOLK_ROOT}/lib64 $ENV{VOLK_ROOT}/lib64 + $ENV{VOLK_DIR}/lib ) include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindVOLKGNSSSDR.cmake b/cmake/Modules/FindVOLKGNSSSDR.cmake index 2e28effe3..0d84a9466 100644 --- a/cmake/Modules/FindVOLKGNSSSDR.cmake +++ b/cmake/Modules/FindVOLKGNSSSDR.cmake @@ -34,28 +34,30 @@ pkg_check_modules(PC_VOLK_GNSSSDR QUIET volk_gnsssdr) find_path(VOLK_GNSSSDR_INCLUDE_DIRS NAMES volk_gnsssdr/volk_gnsssdr.h - HINTS $ENV{VOLK_GNSSSDR_DIR}/include - ${PC_VOLK_GNSSSDR_INCLUDEDIR} - PATHS /usr/local/include - /usr/include + HINTS ${PC_VOLK_GNSSSDR_INCLUDEDIR} + PATHS /usr/include + /usr/local/include + /opt/local/include ${GNURADIO_INSTALL_PREFIX}/include ${VOLKGNSSSDR_ROOT}/include $ENV{VOLKGNSSSDR_ROOT}/include + $ENV{VOLK_GNSSSDR_DIR}/include ) find_library(VOLK_GNSSSDR_LIBRARIES NAMES volk_gnsssdr - HINTS $ENV{VOLK_GNSSSDR_DIR}/lib - ${PC_VOLK_GNSSSDR_LIBDIR} - PATHS /usr/local/lib - /usr/local/lib64 - /usr/lib + HINTS ${PC_VOLK_GNSSSDR_LIBDIR} + PATHS /usr/lib /usr/lib64 + /usr/local/lib + /usr/local/lib64 + /opt/local/lib ${GNURADIO_INSTALL_PREFIX}/lib ${VOLKGNSSSDR_ROOT}/lib $ENV{VOLKGNSSSDR_ROOT}/lib ${VOLKGNSSSDR_ROOT}/lib64 $ENV{VOLKGNSSSDR_ROOT}/lib64 + $ENV{VOLK_GNSSSDR_DIR}/lib ) include(FindPackageHandleStandardArgs)