[urdfdom] 02/03: Add patches to respect standard building system

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository urdfdom.

commit dd97853afa077fa66fa20e93bceb9dbe7e50a0cc
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Thu Jan 9 17:39:29 2014 +0000

    Add patches to respect standard building system
    
    - Avoid fixed value for LIBDIR set by upstream
    - Re-enable generation of soname
---
 .../0002-Respect-cmake-install-libdir.patch        | 22 +++++++++++++
 debian/patches/0003-Enable-soversion-in-libs.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 61 insertions(+)

diff --git a/debian/patches/0002-Respect-cmake-install-libdir.patch b/debian/patches/0002-Respect-cmake-install-libdir.patch
new file mode 100644
index 0000000..798b438
--- /dev/null
+++ b/debian/patches/0002-Respect-cmake-install-libdir.patch
@@ -0,0 +1,22 @@
+From: Jose Luis Rivero <jrivero at osrfoundation.org>
+Date: The Jan 09 17:40:23 2014 +0100
+Subject: Disable upstram fixed value for CMAKE_INSTALL_LIBDIR 
+
+Forwarded: yes
+Bug: https://github.com/ros/urdfdom/issues/21
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+---
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f89ea96..8c4631a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,7 @@ message (STATUS "${PROJECT_NAME} version ${URDF_VERSION}")
+ include(GNUInstallDirs)
+ 
+ # hack: by default this would be 'lib/x86_64-linux-gnu'
+-set(CMAKE_INSTALL_LIBDIR lib)
++# set(CMAKE_INSTALL_LIBDIR lib)
+ 
+ # set the default build type
+ if (NOT CMAKE_BUILD_TYPE)
diff --git a/debian/patches/0003-Enable-soversion-in-libs.patch b/debian/patches/0003-Enable-soversion-in-libs.patch
new file mode 100644
index 0000000..e6f6a71
--- /dev/null
+++ b/debian/patches/0003-Enable-soversion-in-libs.patch
@@ -0,0 +1,37 @@
+From: Jose Luis Rivero <jrivero at osrfoundation.org>
+Date: The Jan 09 17:40:23 2014 +0100
+Subject: Back to enable the soversion generation
+
+Forwarded: yes
+Bug: https://github.com/ros/urdfdom/commit/b96aacb06ba7d935d22c348a7468689c64411c64#commitcomment-5024978
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+---
+
+diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
+index 6caf90a..cd23331 100644
+--- a/urdf_parser/CMakeLists.txt
++++ b/urdf_parser/CMakeLists.txt
+@@ -2,19 +2,19 @@ include_directories(include)
+ 
+ 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} ${Boost_LIBRARIES})
+-#set_target_properties(urdfdom_world PROPERTIES SOVERSION 0.2)
++set_target_properties(urdfdom_world PROPERTIES SOVERSION 0.2)
+ 
+ add_library(urdfdom_model SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp)
+ target_link_libraries(urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
+-#set_target_properties(urdfdom_model PROPERTIES SOVERSION 0.2)
++set_target_properties(urdfdom_model PROPERTIES SOVERSION 0.2)
+ 
+ add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp)
+ target_link_libraries(urdfdom_sensor urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
+-#set_target_properties(urdfdom_sensor PROPERTIES SOVERSION 0.2)
++set_target_properties(urdfdom_sensor PROPERTIES SOVERSION 0.2)
+ 
+ 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} ${Boost_LIBRARIES})
+-#set_target_properties(urdfdom_model_state PROPERTIES SOVERSION 0.2)
++set_target_properties(urdfdom_model_state PROPERTIES SOVERSION 0.2)
+ 
+ # --------------------------------
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3efe86d..03c49a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Fix-installed-CMake-module-to-cope-with-multiarch.patch
+0002-Respect-cmake-install-libdir.patch
+0003-Enable-soversion-in-libs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/urdfdom.git