diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6795e5b9..8385d8a7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -329,7 +329,7 @@ set(GNSSSDR_GPSTK_LOCAL_VERSION "3.0.0")
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.18")
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10")
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.13.0")
-set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.1")
+set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.2")
if(CMAKE_VERSION VERSION_LESS "3.0.2")
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1") # Fix for CentOS 7
@@ -1117,6 +1117,7 @@ if(NOT VOLKGNSSSDR_FOUND)
)
endif()
endif()
+ include(GNUInstallDirs)
if(CMAKE_VERSION VERSION_LESS 3.2)
ExternalProject_Add(volk_gnsssdr_module
PREFIX ${CMAKE_BINARY_DIR}/volk_gnsssdr_module
@@ -1143,7 +1144,7 @@ if(NOT VOLKGNSSSDR_FOUND)
BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
INSTALL_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install
)
endif()
@@ -1169,9 +1170,9 @@ if(NOT VOLKGNSSSDR_FOUND)
INTERFACE_INCLUDE_DIRECTORIES "${VOLK_GNSSSDR_INCLUDE_DIRS}"
INTERFACE_LINK_LIBRARIES "${VOLK_GNSSSDR_LIBRARIES}"
)
- if(CMAKE_VERSION VERSION_GREATER 3.0) # and GCC, and Clang and PYTHON...
+ if(CMAKE_VERSION VERSION_GREATER 3.0)
set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
- INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
+ INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
)
endif()
endif()
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
index 77a359912..9fac8694a 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
@@ -53,7 +53,7 @@ target_include_directories(volk_gnsssdr_profile
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
)
-if(NOT ${FILESYSTEM_FOUND})
+if(NOT FILESYSTEM_FOUND)
target_include_directories(volk_gnsssdr_profile
PUBLIC ${Boost_INCLUDE_DIRS}
)
@@ -61,7 +61,7 @@ if(NOT ${FILESYSTEM_FOUND})
endif()
-if(${FILESYSTEM_FOUND})
+if(FILESYSTEM_FOUND)
add_definitions(-DHAS_STD_FILESYSTEM=1)
if(${find_experimental})
add_definitions(-DHAS_STD_FILESYSTEM_EXPERIMENTAL=1)
@@ -70,9 +70,9 @@ if(${FILESYSTEM_FOUND})
endif()
if(ENABLE_STATIC_LIBS)
- target_link_libraries(volk_gnsssdr_profile PUBLIC volk_gnsssdr_static ${orc_lib})
+ target_link_libraries(volk_gnsssdr_profile PRIVATE volk_gnsssdr_static ${orc_lib})
else()
- target_link_libraries(volk_gnsssdr_profile PUBLIC volk_gnsssdr ${orc_lib})
+ target_link_libraries(volk_gnsssdr_profile PRIVATE volk_gnsssdr ${orc_lib})
add_dependencies(volk_gnsssdr_profile volk_gnsssdr)
endif()
@@ -122,8 +122,8 @@ install(
# Launch volk_gnsssdr_profile if requested to do so
if(ENABLE_PROFILING)
if(DEFINED VOLK_CONFIGPATH)
- set( VOLK_CONFIG_ARG "-p${VOLK_CONFIGPATH}" )
- set( VOLK_CONFIG "${VOLK_CONFIGPATH}/volk_gnsssdr_config" )
+ set(VOLK_CONFIG_ARG "-p${VOLK_CONFIGPATH}")
+ set(VOLK_CONFIG "${VOLK_CONFIGPATH}/volk_gnsssdr_config")
endif()
add_custom_command(OUTPUT ${VOLK_CONFIG}
COMMAND volk_gnsssdr_profile "${VOLK_CONFIG_ARG}"
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/archs.xml b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/archs.xml
index 59fdb54cf..cde79793b 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/archs.xml
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/archs.xml
@@ -46,7 +46,7 @@
-
@@ -58,22 +58,14 @@
-
- 2
- 0x00000001
- 23
-
+
-mpopcnt
-mpopcnt
/arch:AVX
-
- 3
- 0x00000001
- 23
-
+
-mmmx
-mmmx
/arch:SSE
@@ -81,11 +73,7 @@
-
- 2
- 0x00000001
- 12
-
+
-mfma
-mfma
/arch:AVX2
@@ -93,11 +81,7 @@
-
- 3
- 0x00000001
- 25
-
+
-msse
-msse
/arch:SSE
@@ -107,11 +91,7 @@
-
- 3
- 0x00000001
- 26
-
+
-msse2
-msse2
/arch:SSE2
@@ -126,11 +106,7 @@
-
- 2
- 0x00000001
- 0
-
+
-msse3
-msse3
/arch:AVX
@@ -140,11 +116,7 @@
-
- 2
- 0x00000001
- 9
-
+
-mssse3
-mssse3
/arch:AVX
@@ -152,22 +124,14 @@
-
- 2
- 0x80000001
- 6
-
+
-msse4a
-msse4a
16
-
- 2
- 0x00000001
- 19
-
+
-msse4.1
-msse4.1
/arch:AVX
@@ -175,11 +139,7 @@
-
- 2
- 0x00000001
- 20
-
+
-msse4.2
-msse4.2
/arch:AVX
@@ -187,11 +147,7 @@
-
- 2
- 0x00000001
- 28
-
+
-mavx
-mavx
/arch:AVX
@@ -199,12 +155,7 @@
-
- 7
- 0
- 1
- 5
-
+
-mavx2
-mavx2
/arch:AVX2
@@ -212,13 +163,7 @@
-
-
- 7
- 0
- 1
- 16
-
+
-mavx512f
-mavx512f
/arch:AVX512F
@@ -226,13 +171,7 @@
-
-
- 7
- 0
- 1
- 28
-
+
-mavx512cd
-mavx512cd
/arch:AVX512CD