From 031c5e771376c41886371b7abdd6c84df0f71091 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 19 Jul 2025 14:42:50 +0200 Subject: [PATCH] Bump cpu_features to v0.10.1: Moving from mandatory c++14 to at least c++14 --- docs/CHANGELOG.md | 1 + .../volk_gnsssdr/cpu_features/CMakeLists.txt | 6 +----- .../cpu_features/test/CMakeLists.txt | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 31b069727..210a7ccb8 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -37,6 +37,7 @@ All notable changes to GNSS-SDR will be documented in this file. - Fixed building option `-DENABLE_ION=ON` when using CMake >= 4.0. - Updated `gsl-lite` to v1.0.1. See the [gsl-lite release](https://github.com/gsl-lite/gsl-lite/releases/tag/v1.0.1). +- Updated local `cpu_features` library to v0.10.1. ### Improvements in Usability: diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/CMakeLists.txt index 5b9434122..03a6a0157 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13) -project(CpuFeatures VERSION 0.10.0 LANGUAGES C) +project(CpuFeatures VERSION 0.10.1 LANGUAGES C) set(CMAKE_C_STANDARD 99) @@ -214,10 +214,6 @@ if(BUILD_TESTING) # found. enable_language(CXX) - set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) # prefer use of -std14 instead of -gnustd14 - if(NOT TARGET gtest OR NOT TARGET gmock_main) # Download and unpack googletest at configure time. configure_file( diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/CMakeLists.txt index 01a67a026..2c3facc84 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/CMakeLists.txt @@ -10,20 +10,25 @@ add_definitions(-DCPU_FEATURES_TEST) ##------------------------------------------------------------------------------ add_library(string_view ../src/string_view.c) +target_compile_features(string_view PUBLIC cxx_std_14) ##------------------------------------------------------------------------------ add_library(filesystem_for_testing filesystem_for_testing.cc) target_compile_definitions(filesystem_for_testing PUBLIC CPU_FEATURES_MOCK_FILESYSTEM) +target_compile_features(filesystem_for_testing PUBLIC cxx_std_14) ##------------------------------------------------------------------------------ add_library(hwcaps_for_testing hwcaps_for_testing.cc) target_link_libraries(hwcaps_for_testing filesystem_for_testing) +target_compile_features(hwcaps_for_testing PUBLIC cxx_std_14) ##------------------------------------------------------------------------------ add_library(stack_line_reader ../src/stack_line_reader.c) target_compile_definitions(stack_line_reader PUBLIC STACK_LINE_READER_BUFFER_SIZE=1024) target_link_libraries(stack_line_reader string_view) +target_compile_features(stack_line_reader PUBLIC cxx_std_14) ##------------------------------------------------------------------------------ add_library(stack_line_reader_for_test ../src/stack_line_reader.c) target_compile_definitions(stack_line_reader_for_test PUBLIC STACK_LINE_READER_BUFFER_SIZE=16) target_link_libraries(stack_line_reader_for_test string_view filesystem_for_testing) +target_compile_features(stack_line_reader_for_test PUBLIC cxx_std_14) ##------------------------------------------------------------------------------ add_library(all_libraries ../src/hwcaps.c @@ -31,6 +36,7 @@ add_library(all_libraries ../src/hwcaps_freebsd_or_openbsd.c ../src/stack_line_reader.c) target_link_libraries(all_libraries hwcaps_for_testing stack_line_reader string_view) +target_compile_features(all_libraries PUBLIC cxx_std_14) # # tests @@ -40,11 +46,13 @@ link_libraries(gtest gmock_main) ## bit_utils_test add_executable(bit_utils_test bit_utils_test.cc) target_link_libraries(bit_utils_test) +target_compile_features(bit_utils_test PUBLIC cxx_std_14) add_test(NAME bit_utils_test COMMAND bit_utils_test) ##------------------------------------------------------------------------------ ## string_view_test add_executable(string_view_test string_view_test.cc ../src/string_view.c) target_link_libraries(string_view_test string_view) +target_compile_features(string_view_test PUBLIC cxx_std_14) add_test(NAME string_view_test COMMAND string_view_test) ##------------------------------------------------------------------------------ ## stack_line_reader_test @@ -62,6 +70,7 @@ if(PROCESSOR_IS_X86) ../src/impl_x86_windows.c ) target_compile_definitions(cpuinfo_x86_test PUBLIC CPU_FEATURES_MOCK_CPUID_X86) + target_compile_features(cpuinfo_x86_test PUBLIC cxx_std_14) if(APPLE) target_compile_definitions(cpuinfo_x86_test PRIVATE HAVE_SYSCTLBYNAME) endif() @@ -73,6 +82,7 @@ endif() if(PROCESSOR_IS_ARM) add_executable(cpuinfo_arm_test cpuinfo_arm_test.cc ../src/impl_arm_linux_or_android.c) target_link_libraries(cpuinfo_arm_test all_libraries) + target_compile_features(cpuinfo_arm_test PUBLIC cxx_std_14) add_test(NAME cpuinfo_arm_test COMMAND cpuinfo_arm_test) endif() ##------------------------------------------------------------------------------ @@ -93,6 +103,7 @@ if(PROCESSOR_IS_AARCH64) target_compile_definitions(cpuinfo_aarch64_test PUBLIC CPU_FEATURES_MOCK_CPUID_AARCH64) endif() target_link_libraries(cpuinfo_aarch64_test all_libraries) + target_compile_features(cpuinfo_aarch64_test PUBLIC cxx_std_14) add_test(NAME cpuinfo_aarch64_test COMMAND cpuinfo_aarch64_test) endif() ##------------------------------------------------------------------------------ @@ -100,6 +111,7 @@ endif() if(PROCESSOR_IS_MIPS) add_executable(cpuinfo_mips_test cpuinfo_mips_test.cc ../src/impl_mips_linux_or_android.c) target_link_libraries(cpuinfo_mips_test all_libraries) + target_compile_features(cpuinfo_mips_test PUBLIC cxx_std_14) add_test(NAME cpuinfo_mips_test COMMAND cpuinfo_mips_test) endif() ##------------------------------------------------------------------------------ @@ -107,6 +119,7 @@ endif() if(PROCESSOR_IS_POWER) add_executable(cpuinfo_ppc_test cpuinfo_ppc_test.cc ../src/impl_ppc_linux.c) target_link_libraries(cpuinfo_ppc_test all_libraries) + target_compile_features(cpuinfo_ppc_test PUBLIC cxx_std_14) add_test(NAME cpuinfo_ppc_test COMMAND cpuinfo_ppc_test) endif() ##------------------------------------------------------------------------------ @@ -114,6 +127,7 @@ endif() if(PROCESSOR_IS_S390X) add_executable(cpuinfo_s390x_test cpuinfo_s390x_test.cc ../src/impl_s390x_linux.c) target_link_libraries(cpuinfo_s390x_test all_libraries) + target_compile_features(cpuinfo_s390x_test PUBLIC cxx_std_14) add_test(NAME cpuinfo_s390x_test COMMAND cpuinfo_s390x_test) endif() ##------------------------------------------------------------------------------ @@ -121,6 +135,7 @@ endif() if(PROCESSOR_IS_RISCV) add_executable(cpuinfo_riscv_test cpuinfo_riscv_test.cc ../src/impl_riscv_linux.c) target_link_libraries(cpuinfo_riscv_test all_libraries) + target_compile_features(cpuinfo_riscv_test PUBLIC cxx_std_14) add_test(NAME cpuinfo_riscv_test COMMAND cpuinfo_riscv_test) endif() ##------------------------------------------------------------------------------ @@ -128,5 +143,6 @@ endif() if(PROCESSOR_IS_LOONGARCH) add_executable(cpuinfo_loongarch_test cpuinfo_loongarch_test.cc ../src/impl_loongarch_linux.c) target_link_libraries(cpuinfo_loongarch_test all_libraries) + target_compile_features(cpuinfo_loongarch_test PUBLIC cxx_std_14) add_test(NAME cpuinfo_loongarch_test COMMAND cpuinfo_loongarch_test) endif() \ No newline at end of file