early-access version 2853
This commit is contained in:
pineappleEA
26
externals/vcpkg/ports/urdfdom/0001_use_math_defines.patch
vendored
Executable file
26
externals/vcpkg/ports/urdfdom/0001_use_math_defines.patch
vendored
Executable file
@@ -0,0 +1,26 @@
|
||||
From a374a5b04db27fde58a11cc2ba5ea10a0d0a7dad Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Paulyshka <me@mixaill.tk>
|
||||
Date: Sun, 3 Sep 2017 23:24:55 +0300
|
||||
Subject: [PATCH] define _USE_MATH_DEFINES
|
||||
|
||||
---
|
||||
urdf_parser/CMakeLists.txt | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
|
||||
index 333226e..2158965 100644
|
||||
--- a/urdf_parser/CMakeLists.txt
|
||||
+++ b/urdf_parser/CMakeLists.txt
|
||||
@@ -1,5 +1,9 @@
|
||||
include_directories(include)
|
||||
|
||||
+if(MSVC)
|
||||
+add_definitions(-D_USE_MATH_DEFINES)
|
||||
+endif()
|
||||
+
|
||||
add_library(urdfdom_world SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp)
|
||||
target_link_libraries(urdfdom_world ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES})
|
||||
set_target_properties(urdfdom_world PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION})
|
||||
--
|
||||
2.12.2.windows.2
|
||||
|
||||
29
externals/vcpkg/ports/urdfdom/0002_fix_exports.patch
vendored
Executable file
29
externals/vcpkg/ports/urdfdom/0002_fix_exports.patch
vendored
Executable file
@@ -0,0 +1,29 @@
|
||||
From 06aa5a06ee543102bf1a4057601adba3490dad60 Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Paulyshka <me@mixaill.tk>
|
||||
Date: Sun, 3 Sep 2017 23:55:11 +0300
|
||||
Subject: [PATCH] fix exports
|
||||
|
||||
---
|
||||
urdf_parser/CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
|
||||
index 2158965..c209228 100644
|
||||
--- a/urdf_parser/CMakeLists.txt
|
||||
+++ b/urdf_parser/CMakeLists.txt
|
||||
@@ -15,10 +15,12 @@ set_target_properties(urdfdom_model PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERS
|
||||
add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp)
|
||||
target_link_libraries(urdfdom_sensor urdfdom_model ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES})
|
||||
set_target_properties(urdfdom_sensor PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION})
|
||||
+set_target_properties(urdfdom_sensor PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
||||
|
||||
add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp)
|
||||
target_link_libraries(urdfdom_model_state ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES})
|
||||
set_target_properties(urdfdom_model_state PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION})
|
||||
+set_target_properties(urdfdom_model_state PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
||||
|
||||
# --------------------------------
|
||||
|
||||
--
|
||||
2.12.2.windows.2
|
||||
|
||||
13
externals/vcpkg/ports/urdfdom/0004_fix-dependency-console_bridge.patch
vendored
Executable file
13
externals/vcpkg/ports/urdfdom/0004_fix-dependency-console_bridge.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 92762f1..f0d115d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -41,7 +41,7 @@ if (NOT MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
endif()
|
||||
|
||||
-find_package(console_bridge 0.3 REQUIRED)
|
||||
+find_package(console_bridge REQUIRED)
|
||||
include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
|
||||
link_directories(${console_bridge_LIBRARY_DIRS})
|
||||
|
||||
101
externals/vcpkg/ports/urdfdom/0005-fix-config-and-install.patch
vendored
Executable file
101
externals/vcpkg/ports/urdfdom/0005-fix-config-and-install.patch
vendored
Executable file
@@ -0,0 +1,101 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f0d115d..9acbfbe 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -58,17 +58,18 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}"
|
||||
|
||||
enable_testing()
|
||||
|
||||
-add_subdirectory(urdf_parser)
|
||||
-
|
||||
if(WIN32 AND NOT CYGWIN)
|
||||
set(CMAKE_CONFIG_INSTALL_DIR CMake)
|
||||
else()
|
||||
set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake/)
|
||||
endif()
|
||||
|
||||
+add_subdirectory(urdf_parser)
|
||||
+
|
||||
set(PKG_NAME ${PROJECT_NAME})
|
||||
set(PKG_LIBRARIES urdfdom_sensor urdfdom_model_state urdfdom_model urdfdom_world)
|
||||
set(PKG_DEPENDS urdfdom_headers console_bridge)
|
||||
+set(PKG_EXPORTS urdfdom)
|
||||
set(cmake_conf_file "cmake/urdfdom-config.cmake")
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${cmake_conf_file}.in" "${CMAKE_BINARY_DIR}/${cmake_conf_file}" @ONLY)
|
||||
install(FILES ${CMAKE_BINARY_DIR}/${cmake_conf_file}
|
||||
diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in
|
||||
index fb81b47..8b4ef8f 100644
|
||||
--- a/cmake/urdfdom-config.cmake.in
|
||||
+++ b/cmake/urdfdom-config.cmake.in
|
||||
@@ -3,8 +3,12 @@ if (@PKG_NAME@_CONFIG_INCLUDED)
|
||||
endif()
|
||||
set(@PKG_NAME@_CONFIG_INCLUDED TRUE)
|
||||
|
||||
-set(@PKG_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include" "@TinyXML_INCLUDE_DIRS@")
|
||||
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
||||
|
||||
+set(@PKG_NAME@_INCLUDE_DIRS "${_IMPORT_PREFIX}/include" "@TinyXML_INCLUDE_DIRS@")
|
||||
+
|
||||
+if (0)
|
||||
foreach(lib @PKG_LIBRARIES@)
|
||||
set(onelib "${lib}-NOTFOUND")
|
||||
find_library(onelib ${lib}
|
||||
@@ -25,3 +29,13 @@ foreach(dep @PKG_DEPENDS@)
|
||||
list(APPEND @PKG_NAME@_INCLUDE_DIRS ${${dep}_INCLUDE_DIRS})
|
||||
list(APPEND @PKG_NAME@_LIBRARIES ${${dep}_LIBRARIES})
|
||||
endforeach()
|
||||
+endif()
|
||||
+
|
||||
+include(CMakeFindDependencyMacro)
|
||||
+find_dependency(console_bridge)
|
||||
+
|
||||
+foreach(exp @PKG_EXPORTS@)
|
||||
+ include(${@PROJECT_NAME@_DIR}/${exp}Export.cmake)
|
||||
+endforeach()
|
||||
+
|
||||
+set(@PKG_NAME@_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state)
|
||||
\ No newline at end of file
|
||||
diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
|
||||
index 731b57a..ebd0586 100644
|
||||
--- a/urdf_parser/CMakeLists.txt
|
||||
+++ b/urdf_parser/CMakeLists.txt
|
||||
@@ -39,10 +39,32 @@ if(BUILD_TESTING)
|
||||
add_subdirectory(test)
|
||||
endif()
|
||||
|
||||
-INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
-INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
-INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test
|
||||
- DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
-INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
-INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+INSTALL(
|
||||
+ TARGETS
|
||||
+ check_urdf
|
||||
+ urdf_to_graphiz
|
||||
+ urdf_mem_test
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+)
|
||||
+INSTALL(
|
||||
+ TARGETS
|
||||
+ urdfdom_model
|
||||
+ urdfdom_world
|
||||
+ urdfdom_sensor
|
||||
+ urdfdom_model_state
|
||||
+ EXPORT
|
||||
+ urdfdom
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+)
|
||||
+install(
|
||||
+ EXPORT urdfdom
|
||||
+ DESTINATION ${CMAKE_CONFIG_INSTALL_DIR}
|
||||
+ NAMESPACE "${PROJECT_NAME}::"
|
||||
+ FILE "urdfdomExport.cmake"
|
||||
+)
|
||||
+
|
||||
INSTALL(DIRECTORY include/urdf_parser DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
40
externals/vcpkg/ports/urdfdom/portfile.cmake
vendored
Executable file
40
externals/vcpkg/ports/urdfdom/portfile.cmake
vendored
Executable file
@@ -0,0 +1,40 @@
|
||||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ros/urdfdom
|
||||
REF 0da4b20675cdbe14b532d484a1c17df85b4e1584 # 1.0.4
|
||||
SHA512 cad59307fef466e2bbe3769a4123571d48223ea25a80dde76cb25c9f6dfc961570090d188ddaf8fc93f41f355ffa240eb00abe20cdea4a5ee3e49f56d1258686
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001_use_math_defines.patch
|
||||
0002_fix_exports.patch
|
||||
0004_fix-dependency-console_bridge.patch
|
||||
0005-fix-config-and-install.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_copy_tools(TOOL_NAMES check_urdf urdf_mem_test urdf_to_graphiz AUTO_CLEAN)
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH CMake)
|
||||
else()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/urdfdom/cmake)
|
||||
# Empty folders
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/urdfdom")
|
||||
endif()
|
||||
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
|
||||
vcpkg_fixup_pkgconfig()
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
20
externals/vcpkg/ports/urdfdom/vcpkg.json
vendored
Executable file
20
externals/vcpkg/ports/urdfdom/vcpkg.json
vendored
Executable file
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"name": "urdfdom",
|
||||
"version": "1.0.4",
|
||||
"port-version": 5,
|
||||
"description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.",
|
||||
"homepage": "https://github.com/ros/urdfdom",
|
||||
"dependencies": [
|
||||
"console-bridge",
|
||||
"tinyxml",
|
||||
"urdfdom-headers",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user