Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

CMakeLists.txt

@@ -403,7 +403,7 @@ set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
 set(GNSSSDR_GPSTK_LOCAL_VERSION "2.10.6")
 set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.9")
-set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.9.0")
+set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.9.1")
 
 if(CMAKE_VERSION VERSION_LESS "3.0.2") # Fix for CentOS 7
     set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")

cmake/Modules/FindGFLAGS.cmake

@@ -73,6 +73,7 @@ else()
         /usr/lib/sparc64-linux-gnu
         /usr/lib/x86_64-linux-gnux32
         /usr/lib/alpha-linux-gnu
+        /usr/lib/riscv64-linux-gnu
         /usr/lib64
         /usr/lib
         ${GFLAGS_ROOT}/lib

cmake/Modules/FindGFORTRAN.cmake

@@ -164,22 +164,34 @@ find_library(GFORTRAN NAMES gfortran
         /usr/lib/sparc64-linux-gnu
         /usr/lib/x86_64-linux-gnux32
         /usr/lib/alpha-linux-gnu
-        /usr/lib/gcc/x86_64-linux-gnu/8     # libgfortran8
+        /usr/lib/gcc/x86_64-linux-gnu/8     # libgfortran-8
         /usr/lib/gcc/aarch64-linux-gnu/8
+        /usr/lib/gcc/arm-linux-gnueabi/8
         /usr/lib/gcc/arm-linux-gnueabihf/8
+        /usr/lib/gcc/hppa-linux-gnu/8
+        /usr/lib/gcc/m68k-linux-gnu/8
+        /usr/lib/gcc/mips-linux-gnu/8
+        /usr/lib/gcc/mips64el-linux-gnuabi64/8
+        /usr/lib/gcc/mipsel-linux-gnu/8
         /usr/lib/gcc/i686-linux-gnu/8
+        /usr/lib/gcc/powerpc-linux-gnuspe/8
+        /usr/lib/gcc/powerpc64-linux-gnu/8
         /usr/lib/gcc/powerpc64le-linux-gnu/8
         /usr/lib/gcc/s390x-linux-gnu/8
         /usr/lib/gcc/alpha-linux-gnu/8
+        /usr/lib/gcc/riscv64-linux-gnu/8
+        /usr/lib/gcc/sh4-linux-gnu/8
+        /usr/lib/gcc/sparc64-linux-gnu/8
+        /usr/lib/gcc/x86_64-linux-gnux32/8
+        /usr/lib/gcc/alpha-linux-gnu/9    # libgfortran-9
         /usr/lib/gcc/x86_64-linux-gnu/9
         /usr/lib/gcc/aarch64-linux-gnu/9
         /usr/lib/gcc/arm-linux-gnueabi/9
         /usr/lib/gcc/arm-linux-gnueabihf/9
         /usr/lib/gcc/i686-linux-gnu/9
         /usr/lib/gcc/powerpc64le-linux-gnu/9
-        /usr/lib/gcc/powerpc64-linux-gnu/9/
+        /usr/lib/gcc/powerpc64-linux-gnu/9
         /usr/lib/gcc/s390x-linux-gnu/9
-        /usr/lib/gcc/alpha-linux-gnu/9
         /usr/lib/gcc/hppa-linux-gnu/9
         /usr/lib/gcc/m68k-linux-gnu/9
         /usr/lib/gcc/mips-linux-gnu/9

cmake/Modules/FindGLOG.cmake

@@ -77,6 +77,7 @@ macro(_FIND_GLOG_LIBRARIES _var)
                 /usr/lib/sparc64-linux-gnu
                 /usr/lib/x86_64-linux-gnux32
                 /usr/lib/alpha-linux-gnu
+                /usr/lib/riscv64-linux-gnu
                 /usr/lib64
                 /usr/lib
                 ${GLOG_ROOT}/lib
@@ -84,6 +85,7 @@ macro(_FIND_GLOG_LIBRARIES _var)
                 ${GLOG_ROOT}/lib64
                 $ENV{GLOG_ROOT}/lib64
                 ${PC_GLOG_LIBDIR}
+                /opt/local/lib
           PATH_SUFFIXES lib
       )
     mark_as_advanced(${_var})
@@ -125,7 +127,7 @@ else()
         _find_glog_libraries(GLOG_LIBRARIES libglog.so)
     endif()
     if(APPLE)
-        _find_glog_libraries(GLOG_LIBRARIES libglog.dylib)
+        _find_glog_libraries(GLOG_LIBRARIES glog)
     endif()
 endif()
 
@@ -166,8 +168,13 @@ set_package_properties(GLOG PROPERTIES
     URL "https://github.com/google/glog"
 )
 
+string(REGEX MATCH libglog.a GLOG_IS_STATIC ${GLOG_LIBRARIES})
 if(GLOG_FOUND AND NOT TARGET Glog::glog)
-    add_library(Glog::glog SHARED IMPORTED)
+    if(GLOG_IS_STATIC)
+        add_library(Glog::glog STATIC IMPORTED)
+    else()
+        add_library(Glog::glog SHARED IMPORTED)
+    endif()
     set_target_properties(Glog::glog PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
         IMPORTED_LOCATION "${GLOG_LIBRARIES}"

cmake/Modules/FindGNURADIO.cmake

@@ -117,6 +117,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE)
                   /usr/lib/sparc64-linux-gnu
                   /usr/lib/x86_64-linux-gnux32
                   /usr/lib/alpha-linux-gnu
+                  /usr/lib/riscv64-linux-gnu
                   /usr/lib64
                   /usr/lib
                   ${GNURADIO_INSTALL_PREFIX}/lib

cmake/Modules/FindGRIIO.cmake

@@ -66,6 +66,7 @@ find_library(IIO_LIBRARIES
           /usr/lib
           /usr/lib64
           /usr/lib/x86_64-linux-gnu
+          /usr/lib/i386-linux-gnu
           /usr/lib/alpha-linux-gnu
           /usr/lib/aarch64-linux-gnu
           /usr/lib/arm-linux-gnueabi
@@ -83,6 +84,7 @@ find_library(IIO_LIBRARIES
           /usr/lib/powerpc-linux-gnuspe
           /usr/lib/powerpc64-linux-gnu
           /usr/lib/powerpc64le-linux-gnu
+          /usr/lib/riscv64-linux-gnu
           /usr/lib/s390x-linux-gnu
           /usr/lib/sparc64-linux-gnu
           /usr/lib/x86_64-linux-gnux32

cmake/Modules/FindGROSMOSDR.cmake

@@ -87,6 +87,7 @@ find_library(GROSMOSDR_LIBRARIES
     /usr/lib/sh4-linux-gnu
     /usr/lib/sparc64-linux-gnu
     /usr/lib/x86_64-linux-gnux32
+    /usr/lib/riscv64-linux-gnu
     /usr/lib/alpha-linux-gnu
     /usr/lib64
     ${GROSMOSDR_ROOT}/lib

cmake/Modules/FindLIBIIO.cmake

@@ -53,6 +53,7 @@ find_library(
           /usr/lib
           /usr/lib64
           /usr/lib/x86_64-linux-gnu
+          /usr/lib/i386-linux-gnu
           /usr/lib/alpha-linux-gnu
           /usr/lib/aarch64-linux-gnu
           /usr/lib/arm-linux-gnueabi
@@ -74,6 +75,7 @@ find_library(
           /usr/lib/sparc64-linux-gnu
           /usr/lib/x86_64-linux-gnux32
           /usr/lib/sh4-linux-gnu
+          /usr/lib/riscv64-linux-gnu
           /Library/Frameworks/iio.framework/
           ${LIBIIO_ROOT}/lib
           $ENV{LIBIIO_ROOT}/lib

cmake/Modules/FindLOG4CPP.cmake

@@ -92,6 +92,7 @@ find_library(LOG4CPP_LIBRARY
         /usr/lib/sparc64-linux-gnu
         /usr/lib/x86_64-linux-gnux32
         /usr/lib/alpha-linux-gnu
+        /usr/lib/riscv64-linux-gnu
         /usr/lib64
         /usr/lib
         /opt/local/lib

cmake/Modules/FindMATIO.cmake

@@ -83,6 +83,25 @@ find_library(MATIO_LIBRARY
       $ENV{MATIO_ROOT}/lib
       ${MATIO_ROOT}/lib64
       $ENV{MATIO_ROOT}/lib64
+      /usr/lib/alpha-linux-gnu
+      /usr/lib/x86_64-linux-gnu
+      /usr/lib/aarch64-linux-gnu
+      /usr/lib/arm-linux-gnueabi
+      /usr/lib/arm-linux-gnueabihf
+      /usr/lib/hppa-linux-gnu
+      /usr/lib/i386-linux-gnu
+      /usr/lib/m68k-linux-gnu
+      /usr/lib/mips-linux-gnu
+      /usr/lib/mips64el-linux-gnuabi64
+      /usr/lib/mipsel-linux-gnu
+      /usr/lib/powerpc-linux-gnuspe
+      /usr/lib/powerpc64-linux-gnu
+      /usr/lib/powerpc64le-linux-gnu
+      /usr/lib/riscv64-linux-gnu
+      /usr/lib/s390x-linux-gnu
+      /usr/lib/sh4-linux-gnu
+      /usr/lib/sparc64-linux-gnu
+      /usr/lib/x86_64-linux-gnux32
     DOC "The MATIO library"
 )
 

cmake/Modules/FindPCAP.cmake

@@ -87,6 +87,7 @@ else()
       ${PCAP_ROOT}/include
       $ENV{PCAP_ROOT}/include
       ${PC_PCAP_INCLUDEDIR}
+      /usr/include
   )
   find_library(PCAP_LIBRARY
     NAMES
@@ -95,6 +96,25 @@ else()
       ${PCAP_ROOT}/lib
       $ENV{PCAP_ROOT}/lib
       ${PC_PCAP_LIBDIR}
+      /usr/lib/alpha-linux-gnu
+      /usr/lib/x86_64-linux-gnu
+      /usr/lib/aarch64-linux-gnu
+      /usr/lib/arm-linux-gnueabi
+      /usr/lib/arm-linux-gnueabihf
+      /usr/lib/hppa-linux-gnu
+      /usr/lib/i386-linux-gnu
+      /usr/lib/m68k-linux-gnu
+      /usr/lib/mips-linux-gnu
+      /usr/lib/mips64el-linux-gnuabi64
+      /usr/lib/mipsel-linux-gnu
+      /usr/lib/powerpc-linux-gnuspe
+      /usr/lib/powerpc64-linux-gnu
+      /usr/lib/powerpc64le-linux-gnu
+      /usr/lib/riscv64-linux-gnu
+      /usr/lib/s390x-linux-gnu
+      /usr/lib/sh4-linux-gnu
+      /usr/lib/sparc64-linux-gnu
+      /usr/lib/x86_64-linux-gnux32
   )
 endif()
 

cmake/Modules/FindPUGIXML.cmake

@@ -65,6 +65,16 @@ find_library(PUGIXML_LIBRARY
           /usr/lib/mipsel-linux-gnu
           /usr/lib/powerpc64le-linux-gnu
           /usr/lib/s390x-linux-gnu
+          /usr/lib/alpha-linux-gnu
+          /usr/lib/hppa-linux-gnu
+          /usr/lib/m68k-linux-gnu
+          /usr/lib/powerpc-linux-gnuspe
+          /usr/lib/powerpc64-linux-gnu
+          /usr/lib/powerpc64le-linux-gnu
+          /usr/lib/sh4-linux-gnu
+          /usr/lib/sparc64-linux-gnu
+          /usr/lib/x86_64-linux-gnux32
+          /usr/lib/riscv64-linux-gnu
           /usr/local/lib
           /usr/local/lib/pugixml-1.9
           /usr/local/lib/pugixml-${PC_PUGIXML_VERSION}

cmake/Modules/FindUHD.cmake

@@ -70,6 +70,7 @@ find_library(UHD_LIBRARIES
           /usr/lib/sparc64-linux-gnu
           /usr/lib/x86_64-linux-gnux32
           /usr/lib/alpha-linux-gnu
+          /usr/lib/riscv64-linux-gnu
           /usr/lib64
           /usr/lib
           ${GNURADIO_INSTALL_PREFIX}/lib

cmake/Modules/FindVOLK.cmake

@@ -64,7 +64,6 @@ find_library(VOLK_LIBRARIES
           /usr/lib/hppa-linux-gnu
           /usr/lib/s390x-linux-gnu
           /usr/lib/i386-gnu
-          /usr/lib/hppa-linux-gnu
           /usr/lib/x86_64-kfreebsd-gnu
           /usr/lib/i386-kfreebsd-gnu
           /usr/lib/m68k-linux-gnu
@@ -72,6 +71,7 @@ find_library(VOLK_LIBRARIES
           /usr/lib/sparc64-linux-gnu
           /usr/lib/x86_64-linux-gnux32
           /usr/lib/alpha-linux-gnu
+          /usr/lib/riscv64-linux-gnu
           /usr/lib64
           ${CMAKE_INSTALL_PREFIX}/lib
           ${VOLK_ROOT}/lib