[urdfdom] Fixing up _IMPORT_PREFIX (#12795)

* Fixing up _IMPORT_PREFIX.

* update version.

* address the feedback.
This commit is contained in:
Sean Yen 2020-09-11 12:45:31 -07:00 committed by GitHub
parent 988cabb2df
commit 4db27d95a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 1 deletions

View File

@ -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@)

View File

@ -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

View File

@ -11,6 +11,7 @@ vcpkg_from_github(
PATCHES
0001_use_math_defines.patch
0002_fix_exports.patch
0003_import_prefix.patch
)
vcpkg_configure_cmake(