Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with Ninja presets #1321

Merged
merged 1 commit into from
Jan 27, 2022
Merged

Fix issue with Ninja presets #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Fixed issue in `CMakePresets.json` where Ninja presets were broken

### Added

### Changed
Expand Down
33 changes: 25 additions & 8 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"binaryDir": "${sourceDir}/build-${presetName}",
"cacheVariables": {
"BASEDIR": "$env{BASEDIR}",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install-${presetName}",
"CMAKE_BUILD_TYPE": "${presetName}"
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install-${presetName}"
}
},
{
Expand All @@ -38,37 +37,55 @@
"name": "Release",
"inherits": "base-gnu",
"displayName": "Release Configure",
"description": "Release build using GNU Make generator"
"description": "Release build using GNU Make generator",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
{
"name": "Debug",
"inherits": "base-gnu",
"displayName": "Debug Configure",
"description": "Debug build using GNU Make generator"
"description": "Debug build using GNU Make generator",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "Aggressive",
"inherits": "base-gnu",
"displayName": "Aggressive Configure",
"description": "Aggressive build using GNU Make generator"
"description": "Aggressive build using GNU Make generator",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Aggressive"
}
},
{
"name": "Release-Ninja",
"inherits": "base-ninja",
"displayName": "Release Ninja Configure",
"description": "Release build using Ninja generator"
"description": "Release build using Ninja generator",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
{
"name": "Debug-Ninja",
"inherits": "base-ninja",
"displayName": "Debug Ninja Configure",
"description": "Debug build using Ninja generator"
"description": "Debug build using Ninja generator",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "Aggressive-Ninja",
"inherits": "base-ninja",
"displayName": "Aggressive Ninja Configure",
"description": "Aggressive build using Ninja generator"
"description": "Aggressive build using Ninja generator",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Aggressive"
}
}
],
"buildPresets": [
Expand Down