Skip to content
This repository was archived by the owner on Jul 19, 2024. It is now read-only.

Commit e9c47b0

Browse files
committed
[vcpkg] Update to CMake 3.14.0
1 parent b5a0378 commit e9c47b0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

bootstrap-vcpkg.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/sh -e
22

33
vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
44
. "$vcpkgRootDir/scripts/bootstrap.sh"

scripts/bootstrap.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ vcpkgCheckEqualFileHash()
7878
echo " File path: [ $downloadPath ]"
7979
echo " Expected hash: [ $sha512 ]"
8080
echo " Actual hash: [ $actualHash ]"
81-
exit
81+
exit 1
8282
fi
8383
}
8484

@@ -234,8 +234,8 @@ buildDir="$vcpkgRootDir/toolsrc/build.rel"
234234
rm -rf "$buildDir"
235235
mkdir -p "$buildDir"
236236

237-
(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics")
238-
(cd "$buildDir" && "$cmakeExe" --build .)
237+
(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics") || exit 1
238+
(cd "$buildDir" && "$cmakeExe" --build .) || exit 1
239239

240240
rm -rf "$vcpkgRootDir/vcpkg"
241241
cp "$buildDir/vcpkg" "$vcpkgRootDir/"

0 commit comments

Comments
 (0)