From e97770f8f675e5777962742c88269e5ee42a4411 Mon Sep 17 00:00:00 2001 From: mykola2312 <49044616+mykola2312@users.noreply.github.com> Date: Sat, 21 May 2022 03:09:14 +0300 Subject: [PATCH] implement CMake ARM architecture compile options auto-config --- CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4be9c5..e07858c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,17 +25,22 @@ set(SOURCES ) set(ARCHITECTURE "ARMv7" CACHE STRING "cutil target architecture") +set(ARM_PROCESSOR "cortex-m4" CACHE STRING "cutil ARM processor") set(ARM_PROFILE "m" CACHE STRING "cutil ARM architecture profile") -if ("${ARCHITECTURE}" STREQUAL "ARMv7") +if ("${ARCHITECTURE}" MATCHES "ARM*") if ("${ARM_PROFILE}" STREQUAL "m") - add_compile_options("-mcpu=cortex-m4") + add_compile_options("-mcpu=${ARM_PROCESSOR}") add_compile_options("-mthumb") else() - add_compile_options("-march=armv7-${ARM_PROFILE}") + string(TOLOWER "${ARCHITECTURE}" COMPILE_ARCHITECTURE) + add_compile_options("-march=${COMPILE_ARCHITECTURE}-${ARM_PROFILE}") endif() endif() +add_compile_definitions(ARM_PROCESSOR="${ARM_PROCESSOR}") +add_compile_definitions(ARM_PROFILE="${ARM_PROFILE}") + add_library(cutil STATIC ${SOURCES} ${HEADERS} "arch/${ARCHITECTURE}.S" )