diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-10-13 13:17:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 13:17:32 -0700 |
| commit | 75bd2efe0dce862dfa025209b8cecc61a00a1852 (patch) | |
| tree | 8f490bc7e3c4fffe5a1b3f641a6373a6ea341cc8 /ports/urdfdom-headers | |
| parent | e14917f04b2a79b22087cab67ab80c0e3d47c8ba (diff) | |
| download | vcpkg-75bd2efe0dce862dfa025209b8cecc61a00a1852.tar.gz vcpkg-75bd2efe0dce862dfa025209b8cecc61a00a1852.zip | |
[many ports] 2019.09.14 Updates (#13536)
* [many ports] 2019.09.14 Updates
* Revert failure ports
* Revert failure ports
* Revert failure ports
* [urdfdom] Fix find dependency console_bridge
* Revert failure ports
* [devil] Compatible with jasper 2.0.20
* [devil] Refix compatible with jasper functions declaration on different os
* Update ports/alembic/CONTROL
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Revert failure ports wangle
* [azure-kinect-sensor-sdk] Fix build with matroska 1.6.2
* Revert failure ports
* Revert failure ports
* [urdfdom-headers] Fix include path in config.cmake file
* upload patch
* [urdfdom-headers] Refix include path in config.cmake file
* [qt5-imageformats] Fix missing include math.h
* [urdfdom-headers] Refix include path in config.cmake file
* [qt5] Fix adding option PATCHES and other options when using qt_submodule_installation
* Remove updated ports version
* Commit suggestions
* [libideviceactivation] revert
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/urdfdom-headers')
| -rw-r--r-- | ports/urdfdom-headers/CONTROL | 2 | ||||
| -rw-r--r-- | ports/urdfdom-headers/fix-include-path.patch | 15 | ||||
| -rw-r--r-- | ports/urdfdom-headers/portfile.cmake | 9 |
3 files changed, 20 insertions, 6 deletions
diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL index d2399647f..fca096943 100644 --- a/ports/urdfdom-headers/CONTROL +++ b/ports/urdfdom-headers/CONTROL @@ -1,4 +1,4 @@ Source: urdfdom-headers -Version: 1.0.4-1 +Version: 1.0.5 Homepage: https://github.com/ros/urdfdom_headers Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF. diff --git a/ports/urdfdom-headers/fix-include-path.patch b/ports/urdfdom-headers/fix-include-path.patch new file mode 100644 index 000000000..6ecfad8eb --- /dev/null +++ b/ports/urdfdom-headers/fix-include-path.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/urdfdom_headers-config.cmake.in b/cmake/urdfdom_headers-config.cmake.in +index 4686d39..026b65e 100644 +--- a/cmake/urdfdom_headers-config.cmake.in ++++ b/cmake/urdfdom_headers-config.cmake.in +@@ -3,8 +3,8 @@ if (@PACKAGE_NAME@_CONFIG_INCLUDED) + endif() + set(@PACKAGE_NAME@_CONFIG_INCLUDED TRUE) + +-set(@PACKAGE_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/include") ++set(@PACKAGE_NAME@_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include") + +-include("${@PACKAGE_NAME@_DIR}/@PACKAGE_NAME@Export.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/@PACKAGE_NAME@Export.cmake") + + list(APPEND @PACKAGE_NAME@_TARGETS @PACKAGE_NAME@::@PACKAGE_NAME@) diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake index 5f7430f76..0ecbe2dce 100644 --- a/ports/urdfdom-headers/portfile.cmake +++ b/ports/urdfdom-headers/portfile.cmake @@ -1,11 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom_headers - REF 00c1c9c231e46b2300d04073ad696521758fa45c - SHA512 8622cfad074454ae34be3e77c37b201adeb0e348df251e1c2fd57f35ae24817bbd2880a9c465056976eb8815fda041ba2fbd70ccb7cac6efc5ed3d7a082e80ef + REF a15d906ff16a7fcbf037687b9c63b946c0cc04a1 # 1.0.5 + SHA512 794acd3b077a1d8fa27d0a698cecbce42f3a7b30f867e79b9897b0d97dcd9e80d2cf3b0c75ee34f628f73afb871c439fffe4a1d7ed85c7fac6553fb1e5b56c36 HEAD_REF master + PATCHES fix-include-path.patch ) vcpkg_configure_cmake( @@ -30,4 +29,4 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |