mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 11:26:04 +08:00
Export path to the Ninja executable
This path will be used as CMAKE_MAKE_PROGRAM explicitly. Change-Id: Ic15253f837b798c468f782ad4116d1ba4cc7c934 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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${version}.zip"
|
||||
@@ -15,4 +16,6 @@ DestDir="/usr/local/bin/"
|
||||
|
||||
InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" ""
|
||||
|
||||
SetEnvVar "NINJA_EXECUTABLE" "$DestDir/ninja"
|
||||
|
||||
echo "Ninja = $version" >> ~/versions.txt
|
||||
|
||||
@@ -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")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user