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