You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/03/25 05:57:49 UTC

(nuttx) branch master updated: CMake:Duplicate definition of CMAKE_CXX_STANDARD

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 ce61e866c3 CMake:Duplicate definition of CMAKE_CXX_STANDARD
ce61e866c3 is described below

commit ce61e866c3458e3487fe423a7331f41bcade4d9d
Author: zhangjun21 <zh...@xiaomi.com>
AuthorDate: Tue Feb 6 11:12:38 2024 +0800

    CMake:Duplicate definition of CMAKE_CXX_STANDARD
    
    CMAKE_CXX_STANDARD is repeatedly defined in the two files, nuttx/CMakeLists(14) and libs/libxx/libcxx.cmake(17), and is defined to different values. Matter needs to use the new features(std::is_signed_v) of c++17,so delete the definition in nuttx/CMakeLists and retain the definition in libs/libxx/libcxx.cmake.
    
    Signed-off-by: zhangjun21 <zh...@xiaomi.com>
---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab6a9efa9c..69f856617a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,6 @@ endif()
 
 # Basic CMake configuration ##################################################
 
-set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_EXTENSIONS OFF)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)