Skip to content

Commit

Permalink
CMAKE: Allow ASY_VERSION_OVERRIDE environment variable to be used for…
Browse files Browse the repository at this point in the history
… overriding version.
  • Loading branch information
jamievlin committed Aug 25, 2024
1 parent 0b368ad commit d8f8b02
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,25 @@
"rhs": "Windows"
}
},
{
"name": "base/allow_version_override_from_env",
"hidden": true,
"cacheVariables": {
"ASY_VERSION_OVERRIDE": "$env{ASY_VERSION_OVERRIDE}"
}
},

{
"name": "linux/release",
"displayName": "[linux-x86/64] Release",
"binaryDir": "${sourceDir}/cmake-build-linux/release",
"inherits": ["base/buildBaseWithVcpkg", "base/release"]
"inherits": ["base/buildBaseWithVcpkg", "base/release", "base/allow_version_override_from_env"]
},
{
"name": "linux/release-ccache",
"displayName": "[linux-x86/64] Release (with ccache)",
"binaryDir": "${sourceDir}/cmake-build-linux/release",
"inherits": ["base/buildBaseWithVcpkg", "base/release", "base/linuxCcache"]
"inherits": ["linux/release", "base/linuxCcache"]
},
{
"name": "linux/releaseWithDebugInfo",
Expand All @@ -104,7 +111,7 @@
"binaryDir": "${sourceDir}/cmake-build-msvc/release",
"inherits": [
"base/buildBaseWithVcpkg", "base/release", "base/gccCompatCacheVar",
"base/windows-only", "base/ensure-cl-compiler"
"base/windows-only", "base/ensure-cl-compiler", "base/allow_version_override_from_env"
],
"cacheVariables": {
"CMAKE_INSTALL_PREFIX": "${sourceDir}/cmake-install-w32-nsis-release"
Expand Down

0 comments on commit d8f8b02

Please sign in to comment.