diff options
| author | Sean Yen <seanyen@microsoft.com> | 2020-09-11 12:45:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 12:45:31 -0700 |
| commit | 4db27d95a80e7822213f0abec5c79778acd941c4 (patch) | |
| tree | e665c5c7b3c41e043106ecffec566b8823f11d5b | |
| parent | 988cabb2dfa0a94317f211a52597d0c5f0f74f6f (diff) | |
| download | vcpkg-4db27d95a80e7822213f0abec5c79778acd941c4.tar.gz vcpkg-4db27d95a80e7822213f0abec5c79778acd941c4.zip | |
[urdfdom] Fixing up _IMPORT_PREFIX (#12795)
* Fixing up _IMPORT_PREFIX.
* update version.
* address the feedback.
| -rw-r--r-- | ports/urdfdom/0003_import_prefix.patch | 15 | ||||
| -rw-r--r-- | ports/urdfdom/CONTROL | 2 | ||||
| -rw-r--r-- | ports/urdfdom/portfile.cmake | 1 |
3 files changed, 17 insertions, 1 deletions
diff --git a/ports/urdfdom/0003_import_prefix.patch b/ports/urdfdom/0003_import_prefix.patch new file mode 100644 index 000000000..3353774af --- /dev/null +++ b/ports/urdfdom/0003_import_prefix.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in
+index fb81b47..3ccad51 100644
+--- a/cmake/urdfdom-config.cmake.in
++++ b/cmake/urdfdom-config.cmake.in
+@@ -3,6 +3,10 @@ if (@PKG_NAME@_CONFIG_INCLUDED)
+ endif()
+ set(@PKG_NAME@_CONFIG_INCLUDED TRUE)
+
++# Vcpkg fix-ups
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++
+ set(@PKG_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include" "@TinyXML_INCLUDE_DIRS@")
+
+ foreach(lib @PKG_LIBRARIES@)
diff --git a/ports/urdfdom/CONTROL b/ports/urdfdom/CONTROL index 011fe88cc..0775dddd0 100644 --- a/ports/urdfdom/CONTROL +++ b/ports/urdfdom/CONTROL @@ -1,5 +1,5 @@ Source: urdfdom
-Version: 1.0.4 +Version: 1.0.4-1
Homepage: https://github.com/ros/urdfdom
Description: Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.
Build-Depends: console-bridge, tinyxml, urdfdom-headers
diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake index 7b544163c..2c45455ea 100644 --- a/ports/urdfdom/portfile.cmake +++ b/ports/urdfdom/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES 0001_use_math_defines.patch 0002_fix_exports.patch + 0003_import_prefix.patch ) vcpkg_configure_cmake( |