diff options
| author | Alexey Edelev <[email protected]> | 2025-06-17 14:47:29 +0200 |
|---|---|---|
| committer | Alexey Edelev <[email protected]> | 2025-06-24 13:03:22 +0200 |
| commit | fefacee86c7ec7bad7afc60bfbfad51d0163b302 (patch) | |
| tree | 53a1a3476ba2933626817b9e6d624f5ab628b256 /coin/provisioning | |
| parent | e903efbdbce510e27b043c95d61b6ff487cd0638 (diff) | |
This path will be used as CMAKE_MAKE_PROGRAM explicitly.
Change-Id: Ic15253f837b798c468f782ad4116d1ba4cc7c934
Reviewed-by: Alexandru Croitor <[email protected]>
Diffstat (limited to 'coin/provisioning')
| -rwxr-xr-x | coin/provisioning/common/linux/install-ninja.sh | 1 | ||||
| -rwxr-xr-x | coin/provisioning/common/macos/ninja.sh | 3 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/ninja.ps1 | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/coin/provisioning/common/linux/install-ninja.sh b/coin/provisioning/common/linux/install-ninja.sh index b89fc9da5..29406c6d2 100755 --- a/coin/provisioning/common/linux/install-ninja.sh +++ b/coin/provisioning/common/linux/install-ninja.sh @@ -38,5 +38,6 @@ installPrefix="/opt/$dirname" sudo mv "$HOME/$dirname" "$installPrefix" SetEnvVar "PATH" "$installPrefix:\$PATH" +SetEnvVar "NINJA_EXECUTABLE" "$installPrefix/ninja" echo "ninja = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/ninja.sh b/coin/provisioning/common/macos/ninja.sh index 66ac8324b..a6eff5dcc 100755 --- a/coin/provisioning/common/macos/ninja.sh +++ b/coin/provisioning/common/macos/ninja.sh @@ -6,6 +6,7 @@ # shellcheck source=./../unix/InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="1.10.2" internalUrl="http://ci-files01-hki.ci.qt.io/input/mac/ninja-mac_v$%7Bversion%7D.zip" @@ -15,4 +16,6 @@ DestDir="/usr/local/bin/" InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" "" +SetEnvVar "NINJA_EXECUTABLE" "$DestDir/ninja" + echo "Ninja = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/ninja.ps1 b/coin/provisioning/common/windows/ninja.ps1 index 74f13693a..392ff57c6 100644 --- a/coin/provisioning/common/windows/ninja.ps1 +++ b/coin/provisioning/common/windows/ninja.ps1 @@ -50,6 +50,7 @@ $manifest = @" </assembly> "@ +Set-EnvironmentVariable "NINJA_EXECUTABLE" "C:\Utils\Ninja\ninja.exe" $vs2019 = [System.IO.File]::Exists("C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat") |