From e9c47b0a8a569a76b9b67f65169979625faad789 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 19 Mar 2019 16:32:24 -0700
Subject: [PATCH] [vcpkg] Update to CMake 3.14.0

---
 bootstrap-vcpkg.sh   | 2 +-
 scripts/bootstrap.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap-vcpkg.sh b/bootstrap-vcpkg.sh
index a7643894ca..7165a725fd 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 7a1b2777bd..056b21cac7 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/"