diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-08 10:52:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 10:52:14 -0700 |
| commit | b49c739129dfbc6a13e2881494084119fc221a5e (patch) | |
| tree | e43a7dbd5b082bcda3f907933d143d00f40f44b0 /scripts/bootstrap.sh | |
| parent | fb47d74d6d6d6f0c0497c8c9b50830b9b47f754c (diff) | |
| parent | 97b7134f41b48963345ef3d6bdf950c8d569d43d (diff) | |
| download | vcpkg-b49c739129dfbc6a13e2881494084119fc221a5e.tar.gz vcpkg-b49c739129dfbc6a13e2881494084119fc221a5e.zip | |
Merge pull request #5702 from kiwixz/pr/cmake_3_14
Update to cmake 3.14 (allow compilation with VS2019RC v142)
Diffstat (limited to 'scripts/bootstrap.sh')
| -rw-r--r-- | scripts/bootstrap.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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/" |