This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 542e2ba625 CMake/preprocess: fix typo PREPROCES -> PREPROCESS
542e2ba625 is described below
commit 542e2ba625349dbd33e57a81abb495387dcef6b6
Author: chao an <[email protected]>
AuthorDate: Wed Sep 25 09:20:46 2024 +0800
CMake/preprocess: fix typo PREPROCES -> PREPROCESS
correct the marco define from PREPROCES to PREPROCESS
Signed-off-by: chao an <[email protected]>
---
CMakeLists.txt | 10 +++++-----
arch/arm/src/cmake/platform.cmake | 2 +-
arch/arm64/src/cmake/platform.cmake | 2 +-
arch/risc-v/src/cmake/platform.cmake | 2 +-
arch/tricore/src/cmake/platform.cmake | 2 +-
arch/x86_64/src/cmake/platform.cmake | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b841425bac..6154781af2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -593,14 +593,14 @@ endif()
get_property(ldscript GLOBAL PROPERTY LD_SCRIPT)
# Pre-compile linker script
-if(DEFINED PREPROCES)
+if(DEFINED PREPROCESS)
get_filename_component(LD_SCRIPT_NAME ${ldscript} NAME)
set(LD_SCRIPT_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_NAME}.tmp")
add_custom_command(
OUTPUT ${LD_SCRIPT_TMP}
DEPENDS ${ldscript}
- COMMAND ${PREPROCES} -I${CMAKE_BINARY_DIR}/include -I${NUTTX_CHIP_ABS_DIR}
+ COMMAND ${PREPROCESS} -I${CMAKE_BINARY_DIR}/include -I${NUTTX_CHIP_ABS_DIR}
${ldscript} > ${LD_SCRIPT_TMP}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
@@ -752,14 +752,14 @@ if(CONFIG_BUILD_PROTECTED)
get_property(user_ldscript GLOBAL PROPERTY LD_SCRIPT_USER)
- if(DEFINED PREPROCES)
+ if(DEFINED PREPROCESS)
get_filename_component(LD_SCRIPT_NAME ${user_ldscript} NAME)
set(LD_SCRIPT_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_NAME}.tmp")
add_custom_command(
OUTPUT ${LD_SCRIPT_TMP}
DEPENDS ${user_ldscript}
- COMMAND ${PREPROCES} -I${CMAKE_BINARY_DIR}/include
-I${NUTTX_CHIP_ABS_DIR}
- ${user_ldscript} > ${LD_SCRIPT_TMP}
+ COMMAND ${PREPROCESS} -I${CMAKE_BINARY_DIR}/include
+ -I${NUTTX_CHIP_ABS_DIR} ${user_ldscript} > ${LD_SCRIPT_TMP}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
add_custom_target(user_ldscript_tmp DEPENDS ${LD_SCRIPT_TMP})
add_dependencies(nuttx_user user_ldscript_tmp)
diff --git a/arch/arm/src/cmake/platform.cmake
b/arch/arm/src/cmake/platform.cmake
index 5d6287cfc1..b92ec7eb5a 100644
--- a/arch/arm/src/cmake/platform.cmake
+++ b/arch/arm/src/cmake/platform.cmake
@@ -119,4 +119,4 @@ endif()
nuttx_add_extra_library(${EXTRA_LIB})
-set(PREPROCES ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)
+set(PREPROCESS ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)
diff --git a/arch/arm64/src/cmake/platform.cmake
b/arch/arm64/src/cmake/platform.cmake
index 92bead9260..0f12b7ffc0 100644
--- a/arch/arm64/src/cmake/platform.cmake
+++ b/arch/arm64/src/cmake/platform.cmake
@@ -67,4 +67,4 @@ endif()
nuttx_add_extra_library(${EXTRA_LIB})
-set(PREPROCES ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)
+set(PREPROCESS ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)
diff --git a/arch/risc-v/src/cmake/platform.cmake
b/arch/risc-v/src/cmake/platform.cmake
index 90fbfcd155..daaad0ae05 100644
--- a/arch/risc-v/src/cmake/platform.cmake
+++ b/arch/risc-v/src/cmake/platform.cmake
@@ -72,4 +72,4 @@ endif()
nuttx_add_extra_library(${EXTRA_LIB})
-set(PREPROCES ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)
+set(PREPROCESS ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)
diff --git a/arch/tricore/src/cmake/platform.cmake
b/arch/tricore/src/cmake/platform.cmake
index 0c7ef6a60d..f653f3cf51 100644
--- a/arch/tricore/src/cmake/platform.cmake
+++ b/arch/tricore/src/cmake/platform.cmake
@@ -71,5 +71,5 @@ if(CONFIG_TRICORE_TOOLCHAIN_GNU)
nuttx_add_extra_library(${EXTRA_LIB})
- set(PREPROCES ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)
+ set(PREPROCESS ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)
endif()
diff --git a/arch/x86_64/src/cmake/platform.cmake
b/arch/x86_64/src/cmake/platform.cmake
index 8c6b8b504c..a160c03b35 100644
--- a/arch/x86_64/src/cmake/platform.cmake
+++ b/arch/x86_64/src/cmake/platform.cmake
@@ -71,4 +71,4 @@ endif()
nuttx_add_extra_library(${EXTRA_LIB})
separate_arguments(CMAKE_C_FLAG_ARGS NATIVE_COMMAND ${CMAKE_C_FLAGS})
-set(PREPROCES ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)
+set(PREPROCESS ${CMAKE_C_COMPILER} ${CMAKE_C_FLAG_ARGS} -E -P -x c)