Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions templates/cmake/CMakePresets.json.gsl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions version4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4323,9 +4323,9 @@

<!-- optimization -->
<configuration name="optimization-host-native" description="Factored settings for march/mtune using for local execution." hidden="true" inherits="nix-base">
<property name="cacheVariables" type="object">
<property name="CMAKE_C_FLAGS" value="$env{CMAKE_C_FLAGS} -march=native -mtune=native" />
<property name="CMAKE_CXX_FLAGS" value="$env{CMAKE_CXX_FLAGS} -march=native -mtune=native" />
<property name="environment" type="object">
<property name="CMAKE_C_FLAGS" value="$penv{CMAKE_C_FLAGS} -march=native -mtune=native" />
<property name="CMAKE_CXX_FLAGS" value="$penv{CMAKE_CXX_FLAGS} -march=native -mtune=native" />
</property>
</configuration>
<!--
Expand Down Expand Up @@ -4365,31 +4365,31 @@
<property value="nix-base" />
</property>
</configuration>
<configuration name="nix-gnu-debug-static-native" description="Debug build with static linking for native architecture." hidden="false" display="*nix/GNU/Debug/Static">
<configuration name="nix-gnu-debug-static-native" description="Debug build with static linking for native architecture." hidden="false" display="*nix/GNU/Debug/Static/Native">
<property name="inherits" type="list">
<property value="optimization-host-native" />
<property value="link-static" />
<property value="gnu-debug" />
<property value="nix-base" />
</property>
</configuration>
<configuration name="nix-gnu-debug-shared-native" description="Debug build with shared linking for native architecture." hidden="false" display="*nix/GNU/Debug/Shared">
<configuration name="nix-gnu-debug-shared-native" description="Debug build with shared linking for native architecture." hidden="false" display="*nix/GNU/Debug/Shared/Native">
<property name="inherits" type="list">
<property value="optimization-host-native" />
<property value="link-shared" />
<property value="gnu-debug" />
<property value="nix-base" />
</property>
</configuration>
<configuration name="nix-gnu-release-static-native" description="Release build with static linking and standard optimizations for native architecture." hidden="false" display="*nix/GNU/Release/Static">
<configuration name="nix-gnu-release-static-native" description="Release build with static linking and standard optimizations for native architecture." hidden="false" display="*nix/GNU/Release/Static/Native">
<property name="inherits" type="list">
<property value="optimization-host-native" />
<property value="link-static" />
<property value="gnu-release" />
<property value="nix-base" />
</property>
</configuration>
<configuration name="nix-gnu-release-shared-native" description="Release build with shared linking and standard optimizations for native architecture." hidden="false" display="*nix/GNU/Release/Shared">
<configuration name="nix-gnu-release-shared-native" description="Release build with shared linking and standard optimizations for native architecture." hidden="false" display="*nix/GNU/Release/Shared/Native">
<property name="inherits" type="list">
<property value="optimization-host-native" />
<property value="link-shared" />
Expand Down
Loading