зеркало из https://github.com/microsoft/vcpkg.git
[vcpkg] Update to CMake 3.14.0
This commit is contained in:
Родитель
b5a0378a28
Коммит
e9c47b0a8a
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
#!/bin/sh -e
|
||||
|
||||
vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
|
||||
. "$vcpkgRootDir/scripts/bootstrap.sh"
|
||||
|
|
|
@ -78,7 +78,7 @@ vcpkgCheckEqualFileHash()
|
|||
echo " File path: [ $downloadPath ]"
|
||||
echo " Expected hash: [ $sha512 ]"
|
||||
echo " Actual hash: [ $actualHash ]"
|
||||
exit
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -234,8 +234,8 @@ buildDir="$vcpkgRootDir/toolsrc/build.rel"
|
|||
rm -rf "$buildDir"
|
||||
mkdir -p "$buildDir"
|
||||
|
||||
(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics")
|
||||
(cd "$buildDir" && "$cmakeExe" --build .)
|
||||
(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics") || exit 1
|
||||
(cd "$buildDir" && "$cmakeExe" --build .) || exit 1
|
||||
|
||||
rm -rf "$vcpkgRootDir/vcpkg"
|
||||
cp "$buildDir/vcpkg" "$vcpkgRootDir/"
|
||||
|
|
Загрузка…
Ссылка в новой задаче