Browse Source

【待合】解决宏定义可见性问题

master
Lizongdi 3 weeks ago
parent
commit
ac46050020
  1. 4
      Bingoo/CMakeLists.txt
  2. 2
      Bingoo/main/CMakeLists.txt

4
Bingoo/CMakeLists.txt

@ -49,17 +49,17 @@ function(add_module MOD_NAME MOD_PATH)
if(${BUILD_${MOD_UPPER}}) if(${BUILD_${MOD_UPPER}})
set(BUILD_${MOD_UPPER}_HAS_TEST ${HAS_TEST} CACHE INTERNAL "Has test support") set(BUILD_${MOD_UPPER}_HAS_TEST ${HAS_TEST} CACHE INTERNAL "Has test support")
add_subdirectory(${MOD_PATH})
list(APPEND GLOBAL_ENABLED_MODULES ${MOD_NAME}) list(APPEND GLOBAL_ENABLED_MODULES ${MOD_NAME})
list(APPEND GLOBAL_ENABLED_MACROS BUILD_${MOD_UPPER}) list(APPEND GLOBAL_ENABLED_MACROS BUILD_${MOD_UPPER})
message(STATUS "[Root] Enabled module(TestSupport: ${HAS_TEST}): ${MOD_NAME} (Default: ${DEFAULT_STATE}) -> Macro: BUILD_${MOD_UPPER}") message(STATUS "[Root] Enabled module(TestSupport: ${HAS_TEST}): ${MOD_NAME} (Default: ${DEFAULT_STATE}) -> Macro: BUILD_${MOD_UPPER}")
set(GLOBAL_ENABLED_MODULES ${GLOBAL_ENABLED_MODULES} PARENT_SCOPE) set(GLOBAL_ENABLED_MODULES ${GLOBAL_ENABLED_MODULES} PARENT_SCOPE)
set(GLOBAL_ENABLED_MACROS ${GLOBAL_ENABLED_MACROS} PARENT_SCOPE) set(GLOBAL_ENABLED_MACROS ${GLOBAL_ENABLED_MACROS} PARENT_SCOPE)
add_subdirectory(${MOD_PATH})
endif() endif()
endfunction() endfunction()
add_module(base base ON OFF) add_module(base base ON OFF)
add_module(common common ON OFF) add_module(CANmotor CANmotor ON OFF)
add_module(controller controller OFF ON) add_module(controller controller OFF ON)
add_module(motor motor OFF ON) add_module(motor motor OFF ON)
add_module(ctrl2 ctrl2 OFF ON) add_module(ctrl2 ctrl2 OFF ON)

2
Bingoo/main/CMakeLists.txt

@ -42,7 +42,7 @@ endif()
if(DEFINED GLOBAL_ENABLED_MACROS AND NOT GLOBAL_ENABLED_MACROS STREQUAL "") if(DEFINED GLOBAL_ENABLED_MACROS AND NOT GLOBAL_ENABLED_MACROS STREQUAL "")
message(STATUS "[Main] Defining macros: ${GLOBAL_ENABLED_MACROS}") message(STATUS "[Main] Defining macros: ${GLOBAL_ENABLED_MACROS}")
target_compile_definitions(${TARGET_NAME} PRIVATE ${GLOBAL_ENABLED_MACROS}) target_compile_definitions(${TARGET_NAME} PUBLIC ${GLOBAL_ENABLED_MACROS})
endif() endif()
target_compile_options(${TARGET_NAME} target_compile_options(${TARGET_NAME}

Loading…
Cancel
Save