LiZongdi
/
robot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【主线待合】解决MCU无法感知BUILD_LOG问题

paint_robot_new-v1.5
Lizongdi 2 weeks ago
parent
e1bf35ce73
commit
cde6c62ee1
1 changed files with 3 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      CMakeLists.txt

9
CMakeLists.txt
View File

@ -37,8 +37,7 @@ if(MY_BUILD_SHARED_LIBS)
endif() endif()
set(GLOBAL_ENABLED_MODULES "" CACHE INTERNAL "List of enabled module targets") set(GLOBAL_ENABLED_MODULES "" CACHE INTERNAL "List of enabled module targets")
set(GLOBAL_ENABLED_MACROS "" CACHE INTERNAL "List of enabled macros for main") set(GLOBAL_ENABLED_MACROS "" CACHE INTERNAL "List of enabled macros for main" FORCE)
set(GLOBAL_ENABLED_MACROS ${GLOBAL_ENABLED_MACROS} PARENT_SCOPE)
function(add_module MOD_NAME MOD_PATH DEFAULT_STATE HAS_TEST) function(add_module MOD_NAME MOD_PATH DEFAULT_STATE HAS_TEST)
if(NOT DEFAULT_STATE STREQUAL "ON" AND NOT DEFAULT_STATE STREQUAL "OFF") if(NOT DEFAULT_STATE STREQUAL "ON" AND NOT DEFAULT_STATE STREQUAL "OFF")
@ -60,10 +59,9 @@ function(add_module MOD_NAME MOD_PATH DEFAULT_STATE HAS_TEST)
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")
list(APPEND GLOBAL_ENABLED_MODULES ${MOD_NAME}) list(APPEND GLOBAL_ENABLED_MODULES ${MOD_NAME})
list(APPEND GLOBAL_ENABLED_MACROS BUILD_${MOD_UPPER}) set(GLOBAL_ENABLED_MACROS "${GLOBAL_ENABLED_MACROS};BUILD_${MOD_UPPER}" CACHE INTERNAL "List of enabled macros for main" FORCE)
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)
add_subdirectory(${MOD_PATH}) add_subdirectory(${MOD_PATH})
endif() endif()
endfunction() endfunction()
@ -103,14 +101,13 @@ function(add_prebuilt_module MOD_NAME MOD_PATH DEFAULT_STATE HAS_TEST)
) )
list(APPEND GLOBAL_ENABLED_MODULES ${MOD_NAME}) list(APPEND GLOBAL_ENABLED_MODULES ${MOD_NAME})
list(APPEND GLOBAL_ENABLED_MACROS BUILD_${MOD_UPPER}) set(GLOBAL_ENABLED_MACROS "${GLOBAL_ENABLED_MACROS};BUILD_${MOD_UPPER}" CACHE INTERNAL "List of enabled macros for main" FORCE)
message(STATUS "[Root] Prebuilt module: ${MOD_NAME} from ${LIB_PATH}") message(STATUS "[Root] Prebuilt module: ${MOD_NAME} from ${LIB_PATH}")
message(STATUS "[Root] Include dir: ${ABS_INCLUDE_DIR}") message(STATUS "[Root] Include dir: ${ABS_INCLUDE_DIR}")
message(STATUS "[Root] Macro: BUILD_${MOD_UPPER}") message(STATUS "[Root] 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)
endfunction() endfunction()
add_module(log library/log OFF OFF) add_module(log library/log OFF OFF)

Write Preview
Loading…
Cancel
Save