diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-09 11:59:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 11:59:32 -0400 |
| commit | c4f1a91ef245ed3e44ea11f13040a77453126165 (patch) | |
| tree | 3e6c99d970fe8a5fcd1551bbcbf9fde4f0b0a3a4 /scripts | |
| parent | 9da7c5c99ee42e382895dbd0dafdd29beaa61075 (diff) | |
| parent | 743e168ef5c7705e44d1d5cab5b9cca22328345e (diff) | |
| download | vcpkg-c4f1a91ef245ed3e44ea11f13040a77453126165.tar.gz vcpkg-c4f1a91ef245ed3e44ea11f13040a77453126165.zip | |
Merge branch 'master' into external_file_abi
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index b0e4f98a5..09d77b07d 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -249,7 +249,7 @@ 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" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 +(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=OFF" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 (cd "$buildDir" && "$cmakeExe" --build .) || exit 1 rm -rf "$vcpkgRootDir/vcpkg" |