Skip to content

Commit

Permalink
Bump vcpkg to recent commit and remove custom ports (#32)
Browse files Browse the repository at this point in the history
* Install directly gts as a Gazebo dependency

As microsoft/vcpkg#10422 was fixed.

* Gazebo and Ignition dependencies: use released version

Fix #26 .

* Bump vcpkg to recent commit

As the ogre ( microsoft/vcpkg#14006 ) and portaudio ( microsoft/vcpkg#13982 ) problems were fixed.
  • Loading branch information
traversaro authored Oct 16, 2020
1 parent a756db5 commit 6064b9e
Show file tree
Hide file tree
Showing 9 changed files with 5 additions and 525 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
cd C:/robotology
git clone https://github.com/Microsoft/vcpkg
cd vcpkg
git checkout 76a7e9248fb3c57350b559966dcaa2d52a5e4458
git checkout 70f192e073dd9e5ed503fc1e86d8a54e2fbaceb4
C:/robotology/vcpkg/bootstrap-vcpkg.sh
git clone https://github.com/robotology/robotology-vcpkg-ports C:/robotology/robotology-vcpkg-ports
cd C:/robotology/robotology-vcpkg-ports
Expand All @@ -43,7 +43,7 @@ jobs:
run: |
# TinyXML is not installed as a workaround for https://github.com/robotology/ycm/pull/296
C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows ace asio boost-asio boost-bind boost-process boost-dll boost-filesystem boost-system freeglut gsl eigen3 esdcan-binary glew glfw3 ode openssl libxml2 libjpeg-turbo eigen3 opencv portaudio matio sdl1 sdl2 qt5-base[latest] ipopt-binary qt5-declarative qt5-multimedia qt5-quickcontrols qt5-quickcontrols2 sqlite3[core,tool]
C:/robotology/vcpkg/vcpkg.exe list
# Remove temporary files https://github.com/Microsoft/vcpkg/blob/master/docs/about/faq.md#how-can-i-remove-temporary-files
# For some reason doing using git bash to do rm -rf fails for icu's port buildtrees, probably for the use of msys2
# See https://github.com/microsoft/vcpkg/issues/10365
Expand Down Expand Up @@ -111,7 +111,8 @@ jobs:
run: |
# Install dependencies for gazebo11 and related ignition dependencies (listed in https://github.com/ignition-tooling/gazebodistro/blob/master/gazebo11.yaml)
C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows boost-asio boost-any boost-date-time boost-filesystem boost-format boost-interprocess boost-iostreams boost-program-options boost-property-tree boost-regex boost-smart-ptr boost-system boost-thread boost-variant boost-uuid bullet3 cppzmq curl dlfcn-win32 freeimage gts libyaml libzip jsoncpp ogre protobuf qt5-base qwt sqlite3[core,tool] tbb tinyxml tinyxml2 urdfdom zeromq
C:/robotology/vcpkg/vcpkg.exe list
# Remove temporary files https://github.com/Microsoft/vcpkg/blob/master/docs/about/faq.md#how-can-i-remove-temporary-files
# For some reason doing using git bash to do rm -rf fails for icu's port buildtrees, probably for the use of msys2
# See https://github.com/microsoft/vcpkg/issues/10365
Expand Down
13 changes: 1 addition & 12 deletions custom-ports/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
# Custom Ports

This directory contains some custom ports that are tipically used to temporary avoid problems in upstream vcpkg.

## portaudio

Backport of https://github.com/microsoft/vcpkg/pull/13306 .
Copied from https://github.com/stekyne/vcpkg/commit/07dcd902b4e109067f3e646f91873b1844685b93 .

## ogre

Forward port of the original ogre port before https://github.com/microsoft/vcpkg/pull/12210 .
Copied from https://github.com/microsoft/vcpkg/tree/3513e92bf9d388ac547d0a87c50a135b4eaa634c/ports/ogre .
Workaround for https://github.com/robotology/robotology-superbuild-dependencies-vcpkg/issues/29 .
This directory contains custom ports that are tipically used to temporary avoid problems in upstream vcpkg.
18 changes: 0 additions & 18 deletions custom-ports/ogre/CONTROL

This file was deleted.

119 changes: 0 additions & 119 deletions custom-ports/ogre/portfile.cmake

This file was deleted.

Loading

0 comments on commit 6064b9e

Please sign in to comment.