diff options
| author | HiFiPhile <[email protected]> | 2025-01-27 19:27:47 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-27 19:27:47 +0100 |
| commit | 67f0d610e5f6b1dea079df88da503eb4c3681f71 (patch) | |
| tree | 32d45e03cf12c2986ae305b031b2cb35b0cb7227 /examples/build_system | |
| parent | 5ca38228308271dda7fdcdeb085de9bb4d6d8f6a (diff) | |
| parent | 0d4f945bdce5bbe47feab51b2a77a26f30aac0bd (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'examples/build_system')
| -rw-r--r-- | examples/build_system/cmake/toolchain/arm_gcc.cmake | 4 | ||||
| -rw-r--r-- | examples/build_system/cmake/toolchain/common.cmake | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/examples/build_system/cmake/toolchain/arm_gcc.cmake b/examples/build_system/cmake/toolchain/arm_gcc.cmake index 0b0949dd8..6a660e259 100644 --- a/examples/build_system/cmake/toolchain/arm_gcc.cmake +++ b/examples/build_system/cmake/toolchain/arm_gcc.cmake @@ -1,3 +1,7 @@ +if (RTOS STREQUAL zephyr) + return() +endif () + if (NOT DEFINED CMAKE_C_COMPILER) set(CMAKE_C_COMPILER "arm-none-eabi-gcc") endif () diff --git a/examples/build_system/cmake/toolchain/common.cmake b/examples/build_system/cmake/toolchain/common.cmake index 688715914..4c181137b 100644 --- a/examples/build_system/cmake/toolchain/common.cmake +++ b/examples/build_system/cmake/toolchain/common.cmake @@ -4,6 +4,7 @@ include(CMakePrintHelpers) # Common # ---------------------------------------------------------------------------- set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_CPU}) set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE) # Look for includes and libraries only in the target system prefix. @@ -13,8 +14,8 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # pass TOOLCHAIN_CPU to -set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CMAKE_SYSTEM_PROCESSOR) -include(${CMAKE_CURRENT_LIST_DIR}/../cpu/${CMAKE_SYSTEM_PROCESSOR}.cmake) +set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_CPU) +include(${CMAKE_CURRENT_LIST_DIR}/../cpu/${CMAKE_SYSTEM_CPU}.cmake) # ---------------------------------------------------------------------------- # Compile flags |