mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:28:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Update to CMake 3.14.0

Browse Source
This commit is contained in:
Robert Schumacher 2019-03-19 16:32:24 -07:00
parent b5a0378a28
commit e9c47b0a8a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap-vcpkg.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh -e
vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P) vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
. "$vcpkgRootDir/scripts/bootstrap.sh" . "$vcpkgRootDir/scripts/bootstrap.sh"

6
scripts/bootstrap.sh
View File

@ -78,7 +78,7 @@ vcpkgCheckEqualFileHash()
echo " File path: [ $downloadPath ]" echo " File path: [ $downloadPath ]"
echo " Expected hash: [ $sha512 ]" echo " Expected hash: [ $sha512 ]"
echo " Actual hash: [ $actualHash ]" echo " Actual hash: [ $actualHash ]"
exit exit 1
fi fi
} }
@ -234,8 +234,8 @@ buildDir="$vcpkgRootDir/toolsrc/build.rel"
rm -rf "$buildDir" rm -rf "$buildDir"
mkdir -p "$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" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics") || exit 1
(cd "$buildDir" && "$cmakeExe" --build .) (cd "$buildDir" && "$cmakeExe" --build .) || exit 1
rm -rf "$vcpkgRootDir/vcpkg" rm -rf "$vcpkgRootDir/vcpkg"
cp "$buildDir/vcpkg" "$vcpkgRootDir/" cp "$buildDir/vcpkg" "$vcpkgRootDir/"