From 66a88ea15bf6562bd92b2ef42ac1c0c95e1cb2c4 Mon Sep 17 00:00:00 2001 From: kaidegit <2857693944@qq.com> Date: Sat, 22 Feb 2025 10:52:44 +0800 Subject: [PATCH] fix cmake generator collect flags --- tools/cmake.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/cmake.py b/tools/cmake.py index fb894d1ed34..bb3c5fee4b3 100644 --- a/tools/cmake.py +++ b/tools/cmake.py @@ -46,9 +46,17 @@ def GenerateCFiles(env, project, project_name): OBJCOPY = tool_path_conv["CMAKE_OBJCOPY"]["path"] FROMELF = tool_path_conv["CMAKE_FROMELF"]["path"] - CFLAGS = rtconfig.CFLAGS.replace('\\', "/").replace('\"', "\\\"") + CFLAGS = rtconfig.CFLAGS + for group in project: + if 'CFLAGS' in group.keys(): + CFLAGS += ' ' + group['CFLAGS'] + CFLAGS = CFLAGS.replace('\\', "/").replace('\"', "\\\"") if 'CXXFLAGS' in dir(rtconfig): - CXXFLAGS = rtconfig.CXXFLAGS.replace('\\', "/").replace('\"', "\\\"") + CXXFLAGS = rtconfig.CXXFLAGS + for group in project: + if 'CXXFLAGS' in group.keys(): + CXXFLAGS +='' + group['CXXFLAGS'] + CXXFLAGS = CXXFLAGS.replace('\\', "/").replace('\"', "\\\"") else: CXXFLAGS = CFLAGS AFLAGS = rtconfig.AFLAGS.replace('\\', "/").replace('\"', "\\\"")