From d8f8b0221e02e4316f9ead0301ce5d2c3c8242ac Mon Sep 17 00:00:00 2001 From: Supakorn 'Jamie' Rassameemasmuang Date: Sun, 25 Aug 2024 14:39:09 -0600 Subject: [PATCH] CMAKE: Allow ASY_VERSION_OVERRIDE environment variable to be used for overriding version. --- CMakePresets.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index eae4f6a70..86ab75c4e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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", @@ -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"