From 67e520e204fd485e28c90aaff87cd4352966ddbd Mon Sep 17 00:00:00 2001 From: Lizongdi <1210855344@qq.com> Date: Fri, 18 Sep 2026 16:50:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=BB=E7=BA=BF=E5=BE=85=E5=90=88?= =?UTF-8?q?=E3=80=91=E8=A7=A3=E5=86=B3MCU=E6=97=A0=E6=B3=95=E6=84=9F?= =?UTF-8?q?=E7=9F=A5BUILD=5FLOG=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6788ee0..358afd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,11 +52,6 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE # Add user defined include paths ) -# Add project symbols (macros) -target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE - # Add user defined symbols -) - # Remove wrong libob.a library dependency when using cpp files list(REMOVE_ITEM CMAKE_C_IMPLICIT_LINK_LIBRARIES ob) @@ -64,6 +59,12 @@ list(REMOVE_ITEM CMAKE_C_IMPLICIT_LINK_LIBRARIES ob) set(GENERATED_COMMON_DIR "${CMAKE_BINARY_DIR}/library/common") include_directories("${GENERATED_COMMON_DIR}") add_subdirectory(robot) +# Add project symbols (macros) — propagate enabled module macros (e.g. BUILD_LOG) +# to the top-level firmware target so common.h sees the correct branches. +target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE + ${GLOBAL_ENABLED_MACROS} + # Add user defined symbols +) target_link_libraries(${CMAKE_PROJECT_NAME} stm32cubemx main