From f15abef22e7784eecc94f41722ed34a217d41eee Mon Sep 17 00:00:00 2001 From: Eric Voskuil Date: Tue, 17 Nov 2026 09:09:12 -0500 Subject: [PATCH] Emit hidden preset inheritance, compose native flags through the env. --- templates/cmake/CMakePresets.json.gsl | 5 +++++ version4.xml | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/templates/cmake/CMakePresets.json.gsl b/templates/cmake/CMakePresets.json.gsl index 6e8e70e0..d44fbee4 100644 --- a/templates/cmake/CMakePresets.json.gsl +++ b/templates/cmake/CMakePresets.json.gsl @@ -129,6 +129,11 @@ $(my.indent)"description": "$(my.config.description)", . if defined(my.config.hidden) $(my.indent)"hidden": $(my.config.hidden), . endif +. if defined(my.config.inherits) +. if (my.config.inherits <> "") +$(my.indent)"inherits": [ "$(my.config.inherits)" ], +. endif +. endif . for my.config.property as _property . emit_property(_property, my.indent, !last() ?? "," ? " ", false) . endfor diff --git a/version4.xml b/version4.xml index a88dfd7e..d0843a95 100644 --- a/version4.xml +++ b/version4.xml @@ -4323,9 +4323,9 @@