From 9b6470a7e6290552d51d33e8debb607ceaacadf0 Mon Sep 17 00:00:00 2001 From: Johannes Demel Date: Wed, 22 Dec 2021 13:31:13 +0100 Subject: [PATCH 1/3] cpu_features: Update submodule pointer We have 3 issues that should be fixed with this commit. Fix #428 Should be fixed because cpu_features detects `arm64` now. Thus, it builds on MacOS and reports M1 capabilities. Fix #478 Fix #484 cpu_features received quite a bit of contributions for FreeBSD. All the issues we had should be fixed now. However, this might require further evaluation. Signed-off-by: Johannes Demel --- cpu_features | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpu_features b/cpu_features index a8397ba45..69d39934e 160000 --- a/cpu_features +++ b/cpu_features @@ -1 +1 @@ -Subproject commit a8397ba4591237c17d18e4acc091f5f3ebe7391e +Subproject commit 69d39934e83be9a0133d2850f15f5debd5eba06f From 2cf381f50cc84d9497ab6e19c87ff8eaefe8bfb3 Mon Sep 17 00:00:00 2001 From: Johannes Demel Date: Wed, 22 Dec 2021 14:01:59 +0100 Subject: [PATCH 2/3] ci: Disable cpu_features tests We don't need cpu_features tests. We are a consumer. Signed-off-by: Johannes Demel --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52d873ce3..fabf80379 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,6 +147,9 @@ if (VOLK_CPU_FEATURES) set(BUILD_PIC ON CACHE BOOL "Build cpu_features with Position Independent Code (PIC)." FORCE) + set(BUILD_TESTING OFF CACHE BOOL + "Build cpu_features without tests." + FORCE) set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}") set(BUILD_SHARED_LIBS OFF) add_subdirectory(cpu_features) From a81d68dad786e750567a63fe88fb496fb9c72a77 Mon Sep 17 00:00:00 2001 From: Johannes Demel Date: Wed, 22 Dec 2021 14:14:17 +0100 Subject: [PATCH 3/3] ci: Update PIC CMake option cpu_features renamed `BUILD_PIC` to `CMAKE_POSITION_INDEPENDENT_CODE`. Let's add that one too. Signed-off-by: Johannes Demel --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fabf80379..d851d842a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,11 +144,12 @@ if (VOLK_CPU_FEATURES) message(FATAL_ERROR "cpu_features/CMakeLists.txt not found. Did you forget to git clone recursively?\nFix with: git submodule update --init") endif() message(STATUS "Building Volk with cpu_features") - set(BUILD_PIC ON CACHE BOOL - "Build cpu_features with Position Independent Code (PIC)." + set(BUILD_TESTING OFF CACHE BOOL "Build cpu_features without tests." FORCE) + set(BUILD_PIC ON CACHE BOOL + "Build cpu_features with Position Independent Code (PIC)." FORCE) - set(BUILD_TESTING OFF CACHE BOOL - "Build cpu_features without tests." + set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL + "Build cpu_features with Position Independent Code (PIC)." FORCE) set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}") set(BUILD_SHARED_LIBS OFF)