nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 02:48:37 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

CMake/preprocess: fix typo PREPROCES -> PREPROCESS

Browse source 
correct the marco define from PREPROCES to PREPROCESS

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-10-29 15:50:31 +08:00 committed by Xiang Xiao
parent 17bca89f07
commit e3689cbb2f
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -583,8 +583,8 @@ if(NOT CONFIG_ARCH_SIM)
get_filename_component(LD_SCRIPT_NAME ${ldscript} NAME) get_filename_component(LD_SCRIPT_NAME ${ldscript} NAME)
set(LD_SCRIPT_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_NAME}.tmp") set(LD_SCRIPT_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_NAME}.tmp")
nuttx_generate_preproces_target(SOURCE_FILE ${ldscript} TARGET_FILE nuttx_generate_preprocess_target(SOURCE_FILE ${ldscript} TARGET_FILE
${LD_SCRIPT_TMP}) ${LD_SCRIPT_TMP})
add_custom_target(ldscript_tmp DEPENDS ${LD_SCRIPT_TMP}) add_custom_target(ldscript_tmp DEPENDS ${LD_SCRIPT_TMP})
add_dependencies(nuttx ldscript_tmp) add_dependencies(nuttx ldscript_tmp)
@ -761,8 +761,8 @@ if(CONFIG_BUILD_PROTECTED)
# Pre-compile linker script # Pre-compile linker script
get_filename_component(LD_SCRIPT_USER_NAME ${user_ldscript} NAME) get_filename_component(LD_SCRIPT_USER_NAME ${user_ldscript} NAME)
set(LD_SCRIPT_USER_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_USER_NAME}.tmp") set(LD_SCRIPT_USER_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_USER_NAME}.tmp")
nuttx_generate_preproces_target(SOURCE_FILE ${user_ldscript} TARGET_FILE nuttx_generate_preprocess_target(SOURCE_FILE ${user_ldscript} TARGET_FILE
${LD_SCRIPT_USER_TMP}) ${LD_SCRIPT_USER_TMP})
add_custom_target(user_ldscript_tmp DEPENDS ${LD_SCRIPT_USER_TMP}) add_custom_target(user_ldscript_tmp DEPENDS ${LD_SCRIPT_USER_TMP})
add_dependencies(nuttx_user user_ldscript_tmp) add_dependencies(nuttx_user user_ldscript_tmp)
set(user_ldscript ${LD_SCRIPT_USER_TMP}) set(user_ldscript ${LD_SCRIPT_USER_TMP})

8
arch/arm/src/cmake/ghs.cmake
View file

@ -194,17 +194,17 @@ endif()
set(PREPROCESS ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P) set(PREPROCESS ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P)
# override nuttx_generate_preproces_target # override nuttx_generate_preprocess_target
set(NUTTX_TOOLCHAIN_PREPROCES_DEFINED true) set(NUTTX_TOOLCHAIN_PREPROCESS_DEFINED true)
function(nuttx_generate_preproces_target) function(nuttx_generate_preprocess_target)
# parse arguments into variables # parse arguments into variables
nuttx_parse_function_args( nuttx_parse_function_args(
FUNC FUNC
nuttx_generate_preproces_target nuttx_generate_preprocess_target
ONE_VALUE ONE_VALUE
SOURCE_FILE SOURCE_FILE
TARGET_FILE TARGET_FILE

2
cmake/nuttx_add_romfs.cmake
View file

@ -101,7 +101,7 @@ function(nuttx_add_romfs)
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${rcpath}) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${rcpath})
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${rcpath}) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${rcpath})
endif() endif()
nuttx_generate_preproces_target( nuttx_generate_preprocess_target(
SOURCE_FILE ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX} TARGET_FILE SOURCE_FILE ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX} TARGET_FILE
${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} DEPENDS nuttx_context) ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} DEPENDS nuttx_context)
list(APPEND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}) list(APPEND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX})

10
cmake/nuttx_toolchain.cmake
View file

@ -37,14 +37,14 @@ if(EXTRA_FLAGS)
endif() endif()
# ~~~ # ~~~
# nuttx_generate_preproces_target # nuttx_generate_preprocess_target
# #
# Description: # Description:
# because different toolchains have different preprocessing instructions, # because different toolchains have different preprocessing instructions,
# we define the COMMON preprocessing target here. # we define the COMMON preprocessing target here.
# #
# Prototype: # Prototype:
# nuttx_generate_preproces_target( # nuttx_generate_preprocess_target(
# SOURCE_FILE # SOURCE_FILE
# ${single_source_file} # ${single_source_file}
# TARGET_FILE # TARGET_FILE
@ -54,14 +54,14 @@ endif()
# ~~~ # ~~~
# #
if(NOT NUTTX_TOOLCHAIN_PREPROCES_DEFINED) if(NOT NUTTX_TOOLCHAIN_PREPROCESS_DEFINED)
function(nuttx_generate_preproces_target) function(nuttx_generate_preprocess_target)
# parse arguments into variables # parse arguments into variables
nuttx_parse_function_args( nuttx_parse_function_args(
FUNC FUNC
nuttx_generate_preproces_target nuttx_generate_preprocess_target
ONE_VALUE ONE_VALUE
SOURCE_FILE SOURCE_FILE
TARGET_FILE TARGET_FILE