aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Traversaro <silvio@traversaro.it>2020-04-21 22:29:35 +0200
committerGitHub <noreply@github.com>2020-04-21 13:29:35 -0700
commit7873205e98686811b2ad3a67ed914f9d6f2f5611 (patch)
treef22cb9dccf852e796a61053c52d31c57e80b7130
parent84cf4b3f83e56755762744225f541c51de27d208 (diff)
downloadvcpkg-7873205e98686811b2ad3a67ed914f9d6f2f5611.tar.gz
vcpkg-7873205e98686811b2ad3a67ed914f9d6f2f5611.zip
[sdformat6] Migrate from Bitbucket to GitHub 🤖 (#10859)
* [sdformat6] Migrate from Bitbucket to GitHub As announced in https://community.gazebosim.org/t/important-gazebo-and-ignition-are-going-to-github/533, the sdformat repository has been migrated from Bitbucket to GitHub. This commit also updates the hash as apparently the archive generated by GitHub is slightly different from the one generated by Bitbucket. * Cleanup of sdformat6 port * Commit to fixup
-rw-r--r--ports/sdformat6/CONTROL3
-rw-r--r--ports/sdformat6/portfile.cmake11
2 files changed, 6 insertions, 8 deletions
diff --git a/ports/sdformat6/CONTROL b/ports/sdformat6/CONTROL
index 5733c129d..8f1e5ed58 100644
--- a/ports/sdformat6/CONTROL
+++ b/ports/sdformat6/CONTROL
@@ -1,5 +1,6 @@
Source: sdformat6
-Version: 6.2.0
+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/portfile.cmake b/ports/sdformat6/portfile.cmake
index 39e4e5bb0..e5e1c04f6 100644
--- a/ports/sdformat6/portfile.cmake
+++ b/ports/sdformat6/portfile.cmake
@@ -1,10 +1,10 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
-vcpkg_from_bitbucket(
+vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO osrf/sdformat
REF sdformat6_6.2.0
- SHA512 3e3934010438bffbf10c1df29bd486c098e3c1bdf2b0349b69a53fb6f4d2bd3b3c8c4b4a8dfb413da13a638c0794f41c1bff4adb11a889b1552d90ba8b94c495
+ SHA512 3d139ec4b4c9fbfd547ed8bfca0adb5cdca92c1b7cc4d4b554a7c51ccf755b9079c26a006ebfedc5bc5b1ba5e16ad950bb38c47ea97bf97e59a2fd7d12d60620
HEAD_REF sdf6
)
@@ -49,7 +49,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdformat6 RENAME copyright)
-
-# Post-build test for cmake libraries
-vcpkg_test_cmake(PACKAGE_NAME SDFormat)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)