diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-05 03:20:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-04 12:20:25 -0700 |
| commit | a59ddd901ac35bc28bbcede79f7762188bcb9aac (patch) | |
| tree | faa7078d08d8ce1fb1720bcae6bba2e1660d5a73 /ports/sdformat9 | |
| parent | 9d727caa3f3e253945e5e0cf3d927e08c85746ba (diff) | |
| download | vcpkg-a59ddd901ac35bc28bbcede79f7762188bcb9aac.tar.gz vcpkg-a59ddd901ac35bc28bbcede79f7762188bcb9aac.zip | |
[vcpkg-baseline][manyport] Fix baseline error (#11742)
* [fastrtps] Fix source hash
* [cpp-taskflow] Update source hash
* [eabase] Re-trigger CI test
* Change repo
* [sdformat9] Re-trigger CI test
* update baseline
* update baseline
* [sdformat9] Fix find dependency urdfdom
Diffstat (limited to 'ports/sdformat9')
| -rw-r--r-- | ports/sdformat9/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sdformat9/fix-dependency-urdfdom.patch | 17 | ||||
| -rw-r--r-- | ports/sdformat9/portfile.cmake | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/ports/sdformat9/CONTROL b/ports/sdformat9/CONTROL index 2242dfcab..d9fba0d8f 100644 --- a/ports/sdformat9/CONTROL +++ b/ports/sdformat9/CONTROL @@ -1,5 +1,5 @@ Source: sdformat9 -Version: 9.2.0 +Version: 9.2.0-1 Homepage: http://sdformat.org/ Build-Depends: ignition-math6, urdfdom, tinyxml Description: Simulation Description Format (SDF) parser and description files. diff --git a/ports/sdformat9/fix-dependency-urdfdom.patch b/ports/sdformat9/fix-dependency-urdfdom.patch new file mode 100644 index 000000000..d2b1a5947 --- /dev/null +++ b/ports/sdformat9/fix-dependency-urdfdom.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 965f1ec..cf2acf4 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -53,10 +53,9 @@ if (NOT PKG_CONFIG_FOUND) + endif() + + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) +- # check for urdfdom with pkg-config +- pkg_check_modules(URDF urdfdom>=1.0) ++ find_package(urdfdom CONFIG REQUIRED) + +- if (NOT URDF_FOUND) ++ if (NOT urdfdom_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy") + set(USE_INTERNAL_URDF true) diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake index 828f04525..c1567efbc 100644 --- a/ports/sdformat9/portfile.cmake +++ b/ports/sdformat9/portfile.cmake @@ -6,8 +6,9 @@ vcpkg_from_github( REF sdformat9_9.2.0 SHA512 6fc7d0ce46d9a7d1cae4fd905ebe6a07bb4ba98faa267be92a32b3409d6d82a99d5082485008a15484f7b5be2c347b5b24bc472fb1a4be5eb8b678b105cae6af HEAD_REF sdf9 - # Backport of https://github.com/osrf/sdformat/pull/269 - PATCHES respect-build-testing.patch + PATCHES + respect-build-testing.patch # Backport of https://github.com/osrf/sdformat/pull/269 + fix-dependency-urdfdom.patch ) # Ruby is required by the sdformat build process |