(nuttx) branch master updated: nuttx/cmake: Remove redundant logic in CMake scripts

[archer]

This is an automated email from the ASF dual-hosted git repository.

archer 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 4bdd33a0354 nuttx/cmake: Remove redundant logic in CMake scripts
4bdd33a0354 is described below

commit 4bdd33a035465f5287b1eeac303a7a7e30c8abf3
Author: wangchengdong <wangchengd...@lixiang.com>
AuthorDate: Fri Oct 17 14:05:46 2025 +0800

    nuttx/cmake: Remove redundant logic in CMake scripts
    
        Simplify the CMake scripts by removing redundant logic to
        improve code readability and maintainability.
    
    Signed-off-by: Chengdong Wang <wangchengd...@lixiang.com>
---
 CMakeLists.txt | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae817ac4f90..39ce9e2c3f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,24 +270,21 @@ if(CONFIG_ARCH_BOARD_CUSTOM)
                          ABSOLUTE BASE_DIR ${NUTTX_DIR})
 else()
   set(NUTTX_BOARD_ABS_DIR ${NUTTX_BOARD_DIR})
-  file(TOUCH ${CMAKE_BINARY_DIR}/boards/dummy/Kconfig)
 endif()
 
 # check if board custom dir points to NuttX upstream board. This is useful when
 # an out-of-tree configuration uses an upstream board directory
 string(FIND "${CONFIG_ARCH_BOARD_CUSTOM_DIR}" "boards/" IS_NUTTX_BOARD)
 
-if(NOT EXISTS ${CMAKE_BINARY_DIR}/boards/dummy/Kconfig)
-  # link dummy/Kconfig only if this is not upstream board otherwise the same
-  # Kconfig file is included twice which cause CMake warnings
-  if(CONFIG_ARCH_BOARD_CUSTOM
-     AND EXISTS ${NUTTX_BOARD_ABS_DIR}/Kconfig
-     AND NOT (IS_NUTTX_BOARD EQUAL 0))
-    nuttx_create_symlink(${NUTTX_BOARD_ABS_DIR}/Kconfig
-                         ${CMAKE_BINARY_DIR}/boards/dummy/Kconfig)
-  else()
-    file(TOUCH ${CMAKE_BINARY_DIR}/boards/dummy/Kconfig)
-  endif()
+# link dummy/Kconfig only if this is not upstream board otherwise the same
+# Kconfig file is included twice which cause CMake warnings
+if(CONFIG_ARCH_BOARD_CUSTOM
+   AND EXISTS ${NUTTX_BOARD_ABS_DIR}/Kconfig
+   AND NOT (IS_NUTTX_BOARD EQUAL 0))
+  nuttx_create_symlink(${NUTTX_BOARD_ABS_DIR}/Kconfig
+                       ${CMAKE_BINARY_DIR}/boards/dummy/Kconfig)
+else()
+  file(TOUCH ${CMAKE_BINARY_DIR}/boards/dummy/Kconfig)
 endif()
 
 # board platform driver
@@ -318,13 +315,11 @@ if(NOT EXISTS ${CMAKE_BINARY_DIR}/arch/dummy)
   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/arch/dummy)
 endif()
 
-if(NOT EXISTS ${CMAKE_BINARY_DIR}/arch/dummy/Kconfig)
-  if(CONFIG_ARCH_CHIP_CUSTOM AND EXISTS ${NUTTX_CHIP_ABS_DIR}/Kconfig)
-    nuttx_create_symlink(${NUTTX_CHIP_ABS_DIR}/Kconfig
-                         ${CMAKE_BINARY_DIR}/arch/dummy/Kconfig)
-  else()
-    file(TOUCH ${CMAKE_BINARY_DIR}/arch/dummy/Kconfig)
-  endif()
+if(CONFIG_ARCH_CHIP_CUSTOM AND EXISTS ${NUTTX_CHIP_ABS_DIR}/Kconfig)
+  nuttx_create_symlink(${NUTTX_CHIP_ABS_DIR}/Kconfig
+                       ${CMAKE_BINARY_DIR}/arch/dummy/Kconfig)
+else()
+  file(TOUCH ${CMAKE_BINARY_DIR}/arch/dummy/Kconfig)
 endif()
 
 if(NOT EXISTS ${CMAKE_BINARY_DIR}/arch/${CONFIG_ARCH})