Skip to content

Commit

Permalink
Switching back to vcpkg master branch (#37)
Browse files Browse the repository at this point in the history
* Switching back to vcpkg master branch

* Update vcpkg_linux.sh
  • Loading branch information
GPSnoopy authored Jan 23, 2019
1 parent 69d197b commit 3776486
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions vcpkg_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ set -e

mkdir -p build
cd build
git clone https://github.com/philjdf/vcpkg.git vcpkg.linux
git clone https://github.com/Microsoft/vcpkg.git vcpkg.linux
cd vcpkg.linux
git checkout ArrowUpdateLinux
./bootstrap-vcpkg.sh

./vcpkg install arrow:x64-linux
5 changes: 2 additions & 3 deletions vcpkg_windows.bat
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
mkdir build || goto :error
cd build || goto :error
git clone https://github.com/philjdf/vcpkg.git vcpkg.windows || goto :error
git clone https://github.com/Microsoft/vcpkg.git vcpkg.windows || goto :error
cd vcpkg.windows || goto :error
git checkout ArrowUpdateLinux || goto :error
call bootstrap-vcpkg.bat || goto :error

vcpkg.exe install arrow:x64-windows-static || goto :error
Expand All @@ -15,4 +14,4 @@ exit /b

:error
echo Failed with error #%errorlevel%.
exit /b %errorlevel%
exit /b %errorlevel%

0 comments on commit 3776486

Please sign in to comment.