From 71d1de5d967c8513f546f101be61f5251ed1b227 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 21 Feb 2025 04:26:13 +0100 Subject: [PATCH] ci: add cppflags to CMAKE_(C|CXX)_FLAGS --- .github/workflows/create-test-plan.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-test-plan.py b/.github/workflows/create-test-plan.py index 29489cfe61..aed4aaece5 100755 --- a/.github/workflows/create-test-plan.py +++ b/.github/workflows/create-test-plan.py @@ -751,10 +751,10 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta )) if not build_parallel: job.cmake_build_arguments.append("-j1") - if job.cflags: - job.cmake_arguments.append(f"-DCMAKE_C_FLAGS=\"{my_shlex_join(job.cflags)}\"") - if job.cxxflags: - job.cmake_arguments.append(f"-DCMAKE_CXX_FLAGS=\"{my_shlex_join(job.cxxflags)}\"") + if job.cflags or job.cppflags: + job.cmake_arguments.append(f"-DCMAKE_C_FLAGS=\"{my_shlex_join(job.cflags + job.cppflags)}\"") + if job.cxxflags or job.cppflags: + job.cmake_arguments.append(f"-DCMAKE_CXX_FLAGS=\"{my_shlex_join(job.cxxflags + job.cppflags)}\"") if job.ldflags: job.cmake_arguments.append(f"-DCMAKE_SHARED_LINKER_FLAGS=\"{my_shlex_join(job.ldflags)}\"") job.cmake_arguments.append(f"-DCMAKE_EXE_LINKER_FLAGS=\"{my_shlex_join(job.ldflags)}\"")