From f0d046ca12dc6bfabaa758fb4a782c37c4c0957b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 25 Apr 2023 20:36:35 +0200 Subject: [PATCH 1/2] Install pkg-config .pc file also on Windows/MSVC (#169) --- CMakeLists.txt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index afc5f9f1..04d38d8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,15 +87,14 @@ install(FILES ${CMAKE_BINARY_DIR}/${cmake_conf_file} DESTINATION ${CMAKE_CONFIG_INSTALL_DIR} COMPONENT cmake) # Make the package config file -if (NOT MSVC) - set(PKG_DESC "Unified Robot Description Format") - set(PKG_DEPENDS "urdfdom_headers console_bridge") # make the list separated by spaces instead of ; - set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model_state -lurdfdom_model -lurdfdom_world") - set(pkg_conf_file "cmake/pkgconfig/urdfdom.pc") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) - install(FILES ${CMAKE_BINARY_DIR}/${pkg_conf_file} - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig) -endif() +set(PKG_DESC "Unified Robot Description Format") +set(PKG_DEPENDS "urdfdom_headers console_bridge") # make the list separated by spaces instead of ; +set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model_state -lurdfdom_model -lurdfdom_world") +set(pkg_conf_file "cmake/pkgconfig/urdfdom.pc") +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) +install(FILES ${CMAKE_BINARY_DIR}/${pkg_conf_file} + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig) + # Add uninstall target From b5fffec979cabb9563f6f0ad3aebd92bdc978bae Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 11 May 2023 22:59:45 +0200 Subject: [PATCH 2/2] Remove Build Status from README (#184) Fix https://github.com/ros/urdfdom/issues/182 . --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 875d5502..0c755b88 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,6 @@ urdfdom The URDF (U-Robot Description Format) library provides core data structures and a simple XML parsers for populating the class data structures from an URDF file. For now, the details of the URDF specifications reside on http://ros.org/wiki/urdf - -### Build Status -[![Build Status](https://travis-ci.org/ros/urdfdom.png)](https://travis-ci.org/ros/urdfdom) ### Using with ROS