diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-03-19 16:32:24 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-03-20 16:23:02 -0700 |
| commit | e9c47b0a8a569a76b9b67f65169979625faad789 (patch) | |
| tree | 959b62289d1105bc70937d8fb9d70f10ae2ee7b8 | |
| parent | b5a0378a285a1aadbdd871136303de871965e474 (diff) | |
| download | vcpkg-e9c47b0a8a569a76b9b67f65169979625faad789.tar.gz vcpkg-e9c47b0a8a569a76b9b67f65169979625faad789.zip | |
[vcpkg] Update to CMake 3.14.0
| -rwxr-xr-x | bootstrap-vcpkg.sh | 2 | ||||
| -rw-r--r-- | scripts/bootstrap.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap-vcpkg.sh b/bootstrap-vcpkg.sh index a7643894c..7165a725f 100755 --- a/bootstrap-vcpkg.sh +++ b/bootstrap-vcpkg.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P) . "$vcpkgRootDir/scripts/bootstrap.sh" diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 7a1b2777b..056b21cac 100644 --- a/scripts/bootstrap.sh +++ b/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/" |