From 43c848cb0c1b6d9c67f7e428935a0a3beea407dc Mon Sep 17 00:00:00 2001 From: Brain Date: Wed, 30 Aug 2023 13:32:21 +0100 Subject: [PATCH] fix: avx on raspberry pi 4 --- cmake/DetectArchitecture.cmake | 4 ++-- library/CMakeLists.txt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/DetectArchitecture.cmake b/cmake/DetectArchitecture.cmake index 13b3d6a31e..ed8698e264 100644 --- a/cmake/DetectArchitecture.cmake +++ b/cmake/DetectArchitecture.cmake @@ -39,7 +39,7 @@ endif() set(CMAKE_REQUIRED_FLAGS_SAVE "${CMAKE_REQUIRED_FLAGS}") -set(AVX_NAME "T_Fallback") +set(AVX_NAME "T_fallback") if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")) foreach(INSTRUCTION_SET IN LISTS INSTRUCTION_SETS) @@ -56,5 +56,5 @@ endforeach() message(STATUS "Detected ${CMAKE_SYSTEM_PROCESSOR} SSE type: ${AVX_DISPLAY}") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_SAVE}") else() - message(STATUS "SSE not supported by architecture ${CMAKE_SYSTEM_PROCESSOR}") + message(STATUS "SSE not supported by architecture ${CMAKE_SYSTEM_PROCESSOR} ${AVX_NAME}") endif() diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 7970b45c20..a8ce71b0fd 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -25,12 +25,13 @@ add_compile_definitions(DPP_OS=${CMAKE_SYSTEM_NAME}) if(${AVX_TYPE} STREQUAL "OFF") include("${CMAKE_CURRENT_SOURCE_DIR}/../cmake/DetectArchitecture.cmake") add_compile_options("${AVX_FLAG}") + add_compile_definitions("${AVX_NAME}") + message("--- AVX type: ${AVX_NAME}") else() message("-- AVX type overridden by configuration: ${AVX_TYPE}") + add_compile_definitions("${AVX_TYPE}") endif() -add_compile_definitions("${AVX_TYPE}") - if(WIN32 AND NOT MINGW) if (NOT WINDOWS_32_BIT) message("-- Building for windows with precompiled packaged dependencies")