diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2021-04-29 07:39:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 07:39:04 -0700 |
| commit | e6cabdece52f3ffc21cf1101b2c72275cac9dbba (patch) | |
| tree | 757887f241188668314ec51f62bfb2de6b2419a2 /ports/sdformat6 | |
| parent | 326eabc1917c45d24ee71044cf98b9d1b051cbc6 (diff) | |
| download | vcpkg-e6cabdece52f3ffc21cf1101b2c72275cac9dbba.tar.gz vcpkg-e6cabdece52f3ffc21cf1101b2c72275cac9dbba.zip | |
[ci] Update macOS to 11 (#17376)
* start 2021-04-16 process
Major new things:
* update to macOS Big Sur (11.*)
* switch from VirtualBox to Parallels due to ^ (and also ARM)
Minor new things:
* update from xcode CLT 12 to 12.4
This PR includes new stuff for creating the base box for parallels.
Still to do: using the new box type.
* update the vagrantfile stuff
* link the CI to the new version
* modify how macOS boxes are made
the Vagrantfile for the final VM will only download the azure pipeline stuff
this allows us to keep the versions of brew applications stable
* fix cpus and memory
* add vagrant plugins to installables
* Skip cppgraphqlgen ICE.
* [sdformat6] Remove unneeded include(FindBoost) which causes problems when the system cmake version doesn't match the one deployed by vcpkg.
* switch to dmg for installing osxfuse/sshfs
* Set cores to 11 (leaving 1 thread for host)
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
Diffstat (limited to 'ports/sdformat6')
| -rw-r--r-- | ports/sdformat6/CONTROL | 6 | ||||
| -rw-r--r-- | ports/sdformat6/disable-unneeded-include-findboost.patch | 12 | ||||
| -rw-r--r-- | ports/sdformat6/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/sdformat6/vcpkg.json | 15 |
4 files changed, 29 insertions, 6 deletions
diff --git a/ports/sdformat6/CONTROL b/ports/sdformat6/CONTROL deleted file mode 100644 index 8f1e5ed58..000000000 --- a/ports/sdformat6/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: sdformat6 -Version: 6.2.0-1 -Homepage: http://sdformat.org/ -Build-Depends: boost-any, boost-variant, ignition-math4, urdfdom, tinyxml -Description: Simulation Description Format (SDF) parser and description files. -Supports: !(arm|uwp)
\ No newline at end of file diff --git a/ports/sdformat6/disable-unneeded-include-findboost.patch b/ports/sdformat6/disable-unneeded-include-findboost.patch new file mode 100644 index 000000000..6a9220292 --- /dev/null +++ b/ports/sdformat6/disable-unneeded-include-findboost.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index c2a0ee4..2735a07 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -13,7 +13,6 @@ if (WIN32) + set(Boost_USE_STATIC_RUNTIME OFF) + endif() + +-include(FindBoost) + find_package(Boost ${MIN_BOOST_VERSION}) + + if (NOT Boost_FOUND) diff --git a/ports/sdformat6/portfile.cmake b/ports/sdformat6/portfile.cmake index e5e1c04f6..1b6babd87 100644 --- a/ports/sdformat6/portfile.cmake +++ b/ports/sdformat6/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF sdformat6_6.2.0 SHA512 3d139ec4b4c9fbfd547ed8bfca0adb5cdca92c1b7cc4d4b554a7c51ccf755b9079c26a006ebfedc5bc5b1ba5e16ad950bb38c47ea97bf97e59a2fd7d12d60620 HEAD_REF sdf6 + PATCHES + disable-unneeded-include-findboost.patch ) # Ruby is required by the sdformat build process diff --git a/ports/sdformat6/vcpkg.json b/ports/sdformat6/vcpkg.json new file mode 100644 index 000000000..84c696992 --- /dev/null +++ b/ports/sdformat6/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "sdformat6", + "version": "6.2.0", + "port-version": 2, + "description": "Simulation Description Format (SDF) parser and description files.", + "homepage": "http://sdformat.org/", + "supports": "!(arm | uwp)", + "dependencies": [ + "boost-any", + "boost-variant", + "ignition-math4", + "tinyxml", + "urdfdom" + ] +} |