Merge branch 'next' into test_android

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt

@@ -362,16 +362,7 @@ endif()
 ########################################################################
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
-    configure_file(
-        ${PROJECT_SOURCE_DIR}/Doxyfile.in
-        ${PROJECT_BINARY_DIR}/Doxyfile
-        @ONLY
-    )
-    add_custom_target(doc
-        ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        COMMENT "Generating documentation with Doxygen" VERBATIM
-    )
+    add_subdirectory(docs)
 endif()
 
 
@@ -396,13 +387,13 @@ set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
 set(includedir "\${prefix}/include")
 
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/volk_gnsssdr.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr.pc
+    ${PROJECT_SOURCE_DIR}/tmpl/volk_gnsssdr.pc.in
+    ${PROJECT_BINARY_DIR}/volk_gnsssdr.pc
     @ONLY
 )
 
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr.pc
+    FILES ${PROJECT_BINARY_DIR}/volk_gnsssdr.pc
     DESTINATION lib${LIB_SUFFIX}/pkgconfig
     COMPONENT "volk_gnsssdr_devel"
 )
@@ -471,14 +462,14 @@ endif()
 ########################################################################
 configure_file(
     ${PROJECT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+    ${PROJECT_BINARY_DIR}/cmake_uninstall.cmake
     @ONLY
 )
 
 # Only add the target if there isn't one defined already
 if(NOT TARGET uninstall)
     add_custom_target(uninstall
-        ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+        ${CMAKE_COMMAND} -P ${PROJECT_BINARY_DIR}/cmake_uninstall.cmake
     )
 endif()
 
@@ -513,8 +504,8 @@ endif()
 
 install(
     FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake/Modules/VolkGnsssdrConfig.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake/Modules/VolkGnsssdrConfigVersion.cmake
+    ${PROJECT_BINARY_DIR}/cmake/Modules/VolkGnsssdrConfig.cmake
+    ${PROJECT_BINARY_DIR}/cmake/Modules/VolkGnsssdrConfigVersion.cmake
     DESTINATION ${CMAKE_MODULES_DIR}/volk_gnsssdr
     COMPONENT "volk_gnsssdr_devel"
 )

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/CMakeLists.txt

@@ -0,0 +1,17 @@
+# GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
+# This file is part of GNSS-SDR.
+#
+# SPDX-FileCopyrightText: 2022 C. Fernandez-Prades cfernandez(at)cttc.es
+# SPDX-License-Identifier: BSD-3-Clause
+
+message(STATUS "Doxygen in docs |${DOXYGEN_FOUND}|")
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+    ${CMAKE_BINARY_DIR}/Doxyfile
+@ONLY)
+
+add_custom_target(volk_gnsssdr_doc
+    ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    COMMENT "Generating documentation with Doxygen" VERBATIM
+)

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/docs/Doxyfile.in

@@ -776,7 +776,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            = @PROJECT_SOURCE_DIR@/DoxygenLayout.xml
+LAYOUT_FILE            = @PROJECT_SOURCE_DIR@/docs/DoxygenLayout.xml
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_alloc.h

@@ -2,7 +2,7 @@
  * \file volk_gnsssdr_alloc.h
  * \author Carles Fernandez, 2019. cfernandez(at)cttc.es
  * \brief C++11 allocator using volk_gnsssdr_malloc and volk_gnsssdr_free.
- * Based on https://github.com/gnuradio/volk/pull/284/ by @hcab14
+ * Based on https://github.com/gnuradio/volk/pull/284/ by hcab14
  *
  * GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
  * This file is part of GNSS-SDR.

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt

@@ -482,6 +482,7 @@ message(STATUS "Loading version ${VERSION} into constants...")
 
 # double escape for windows backslash path separators
 string(REPLACE "\\" "\\\\" prefix "${prefix}")
+string(REPLACE "${CMAKE_SOURCE_DIR}" "$BUILD_DIR" COMPILER_INFO "${COMPILER_INFO}")
 
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/constants.c.in
@@ -638,7 +639,9 @@ if(ENABLE_STATIC_LIBS)
     if(ORC_FOUND)
         target_link_libraries(volk_gnsssdr_static PUBLIC ${ORC_LIBRARIES_STATIC})
     endif()
-    target_link_libraries(volk_gnsssdr_static PRIVATE pthread)
+    if(NOT ANDROID)
+        target_link_libraries(volk_gnsssdr_static PRIVATE pthread)
+    endif()
     if(NOT MSVC)
         target_link_libraries(volk_gnsssdr_static PUBLIC m)
     endif()