[ros-image-common] 03/07: Add patch to fix linking

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository ros-image-common.

commit 819a4a586ba60d8ea8538d3507585adbb7d09bbd
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jan 19 16:17:39 2016 +0100

    Add patch to fix linking
---
 .../patches/0003-Fix-Boost-library-linking.patch   | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0003-Fix-Boost-library-linking.patch b/debian/patches/0003-Fix-Boost-library-linking.patch
new file mode 100644
index 0000000..69b1af8
--- /dev/null
+++ b/debian/patches/0003-Fix-Boost-library-linking.patch
@@ -0,0 +1,26 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 19 Jan 2016 16:05:50 +0100
+Subject: Fix Boost library linking
+
+Boost_LIBRARIES contains now both filesystem and python which implies a
+dependency to libpython.
+---
+ camera_calibration_parsers/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt
+index 3630137..b3c75eb 100644
+--- a/camera_calibration_parsers/CMakeLists.txt
++++ b/camera_calibration_parsers/CMakeLists.txt
+@@ -40,9 +40,9 @@ add_library(${PROJECT_NAME}
+ add_library(${PROJECT_NAME}_wrapper
+   src/parse_wrapper.cpp)
+ 
+-target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES})
++target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY})
+ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${camera_calibration_parsers_VERSION} SOVERSION "0d")
+-target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
++target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES})
+ 
+ # Don't prepend wrapper library name with lib and add to Python libs.
+ set_target_properties(${PROJECT_NAME}_wrapper PROPERTIES
diff --git a/debian/patches/series b/debian/patches/series
index c0916ef..b1e80f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
+0003-Fix-Boost-library-linking.patch

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