cmake:enhance set_source_files_properties for NuttX CMake module

Because `set_source_files_properties` in cmake will overwrite the properties instead of appending them.
This module implements addition and deletion by
first `getting_source_file_property` and then `set_source_files_properties`

Signed-off-by: xuxin19 <xuxin19@xiaomi.com>
This commit is contained in:
xuxin19 2024-04-18 17:39:39 +08:00 committed by Alan Carvalho de Assis
parent 4b11d37cf7
commit 859247c224
3 changed files with 73 additions and 26 deletions

View File

@ -376,6 +376,7 @@ include(nuttx_add_symtab)
include(nuttx_add_module)
include(nuttx_add_dependencies)
include(nuttx_export_header)
include(nuttx_source_file_properties)
include(menuconfig)
include(ExternalProject)

View File

@ -0,0 +1,46 @@
# ##############################################################################
# cmake/nuttx_source_file_properties.cmake
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
# additional information regarding copyright ownership. The ASF licenses this
# file to you under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
#
# ##############################################################################
# Because `set_source_files_properties` in cmake will overwrite the properties
# instead of appending them. This module implements addition and deletion by
# first `getting_source_file_property` and then `set_source_files_properties`
# addition
function(nuttx_append_source_file_properties SOURCE_FILE PROPERTY_NAME
PROPERTY_VALUE)
get_source_file_property(curr_value ${SOURCE_FILE} ${PROPERTY_NAME})
if(NOT curr_value)
set(curr_value "")
endif()
set_source_files_properties(
${SOURCE_FILE} PROPERTIES ${PROPERTY_NAME}
"${curr_value} ${PROPERTY_VALUE}")
endfunction()
# deletion
function(nuttx_remove_source_file_property SOURCE_FILE PROPERTY_NAME
VALUE_TO_REMOVE)
get_source_file_property(curr_value ${SOURCE_FILE} ${PROPERTY_NAME})
if(curr_value)
string(REPLACE ${VALUE_TO_REMOVE} "" new_value ${curr_value})
set_source_files_properties(${SOURCE_FILE} PROPERTIES ${PROPERTY_NAME}
"${new_value}")
endif()
endfunction()

View File

@ -97,40 +97,40 @@ if(NOT DEFINED GCCVER)
endif()
if(GCCVER EQUAL 12)
set_source_files_properties(libcxx/src/filesystem/operations.cpp
PROPERTIES COMPILE_FLAGS -Wno-maybe-uninitialized)
set_source_files_properties(libcxx/src/locale.cpp
PROPERTIES COMPILE_FLAGS -Wno-maybe-uninitialized)
set_source_files_properties(
libcxx/src/string.cpp PROPERTIES COMPILE_FLAGS -Wno-alloc-size-larger-than)
set_source_files_properties(libcxx/src/charconv.cpp
PROPERTIES COMPILE_FLAGS -Wno-attributes)
set_source_files_properties(libcxx/src/locale.cpp PROPERTIES COMPILE_FLAGS
-Wno-attributes)
nuttx_append_source_file_properties(libcxx/src/filesystem/operations.cpp
COMPILE_FLAGS -Wno-maybe-uninitialized)
nuttx_append_source_file_properties(libcxx/src/locale.cpp COMPILE_FLAGS
-Wno-maybe-uninitialized)
nuttx_append_source_file_properties(libcxx/src/string.cpp COMPILE_FLAGS
-Wno-alloc-size-larger-than)
nuttx_append_source_file_properties(libcxx/src/charconv.cpp COMPILE_FLAGS
-Wno-attributes)
nuttx_append_source_file_properties(libcxx/src/locale.cpp COMPILE_FLAGS
-Wno-attributes)
endif()
if(GCCVER GREATER_EQUAL 12)
set_source_files_properties(
libcxx/src/string.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
set_source_files_properties(libcxx/src/filesystem/path.cpp
PROPERTIES COMPILE_FLAGS -Wno-shadow)
set_source_files_properties(libcxx/src/ryu/d2s.cpp
PROPERTIES COMPILE_FLAGS -Wno-maybe-uninitialized)
nuttx_append_source_file_properties(libcxx/src/string.cpp COMPILE_FLAGS
-Wno-deprecated-declarations)
nuttx_append_source_file_properties(libcxx/src/filesystem/path.cpp
COMPILE_FLAGS -Wno-shadow)
nuttx_append_source_file_properties(libcxx/src/ryu/d2s.cpp COMPILE_FLAGS
-Wno-maybe-uninitialized)
endif()
if(GCCVER GREATER_EQUAL 13)
set_source_files_properties(
libcxx/src/string.cpp PROPERTIES COMPILE_FLAGS -Wno-alloc-size-larger-than)
nuttx_append_source_file_properties(libcxx/src/string.cpp COMPILE_FLAGS
-Wno-alloc-size-larger-than)
endif()
set_source_files_properties(libcxx/src/barrier.cpp PROPERTIES COMPILE_FLAGS
-Wno-shadow)
set_source_files_properties(libcxx/src/locale.cpp PROPERTIES COMPILE_FLAGS
-Wno-shadow)
set_source_files_properties(libcxx/src/filesystem/operations.cpp
PROPERTIES COMPILE_FLAGS -Wno-shadow)
set_source_files_properties(libcxx/src/condition_variable.cpp
PROPERTIES COMPILE_FLAGS -Wno-sign-compare)
nuttx_append_source_file_properties(libcxx/src/barrier.cpp COMPILE_FLAGS
-Wno-shadow)
nuttx_append_source_file_properties(libcxx/src/locale.cpp COMPILE_FLAGS
-Wno-shadow)
nuttx_append_source_file_properties(libcxx/src/filesystem/operations.cpp
COMPILE_FLAGS -Wno-shadow)
nuttx_append_source_file_properties(libcxx/src/condition_variable.cpp
COMPILE_FLAGS -Wno-sign-compare)
nuttx_add_system_library(libcxx)
target_sources(libcxx PRIVATE ${SRCS})