[ros-image-common] 05/07: Imported Upstream version 1.11.10
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Tue Jan 19 22:18:24 UTC 2016
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 68ee41dfedb5cd854df3f0e13795da31c8af86e6
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Tue Jan 19 22:55:52 2016 +0100
Imported Upstream version 1.11.10
---
camera_calibration_parsers/CHANGELOG.rst | 10 ++++++++++
camera_calibration_parsers/CMakeLists.txt | 8 ++++++--
camera_calibration_parsers/package.xml | 2 +-
camera_info_manager/CHANGELOG.rst | 3 +++
camera_info_manager/package.xml | 2 +-
image_common/CHANGELOG.rst | 3 +++
image_common/package.xml | 2 +-
image_transport/CHANGELOG.rst | 3 +++
image_transport/package.xml | 2 +-
polled_camera/CHANGELOG.rst | 3 +++
polled_camera/package.xml | 2 +-
11 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/camera_calibration_parsers/CHANGELOG.rst b/camera_calibration_parsers/CHANGELOG.rst
index 806bb70..afde283 100644
--- a/camera_calibration_parsers/CHANGELOG.rst
+++ b/camera_calibration_parsers/CHANGELOG.rst
@@ -2,6 +2,16 @@
Changelog for package camera_calibration_parsers
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.10 (2016-01-19)
+--------------------
+* Add install target for python wrapper library
+* Only link against needed Boost libraries
+ 9829b02 introduced a python dependency into find_package(Boost..) which
+ results in ${Boost_LIBRARIES} containing boost_python and such a
+ dependency to libpython at link time. With this patch we only link
+ against the needed libraries.
+* Contributors: Jochen Sprickerhof, Vincent Rabaud
+
1.11.9 (2016-01-17)
-------------------
* Add python wrapper for readCalibration.
diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt
index 98165ed..4f9bf6d 100644
--- a/camera_calibration_parsers/CMakeLists.txt
+++ b/camera_calibration_parsers/CMakeLists.txt
@@ -40,8 +40,8 @@ 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}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY})
+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
@@ -70,6 +70,10 @@ install(
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
+install(TARGETS ${PROJECT_NAME}_wrapper
+ DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}
+)
+
if(CATKIN_ENABLE_TESTING)
add_subdirectory(test)
endif()
diff --git a/camera_calibration_parsers/package.xml b/camera_calibration_parsers/package.xml
index f0b32ec..bd3fe85 100644
--- a/camera_calibration_parsers/package.xml
+++ b/camera_calibration_parsers/package.xml
@@ -1,6 +1,6 @@
<package>
<name>camera_calibration_parsers</name>
- <version>1.11.9</version>
+ <version>1.11.10</version>
<description>
camera_calibration_parsers contains routines for reading and writing camera calibration parameters.
</description>
diff --git a/camera_info_manager/CHANGELOG.rst b/camera_info_manager/CHANGELOG.rst
index 0b1d7ae..bc030e7 100644
--- a/camera_info_manager/CHANGELOG.rst
+++ b/camera_info_manager/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package camera_info_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.10 (2016-01-19)
+--------------------
+
1.11.9 (2016-01-17)
-------------------
diff --git a/camera_info_manager/package.xml b/camera_info_manager/package.xml
index 7b176ca..6b8b82e 100644
--- a/camera_info_manager/package.xml
+++ b/camera_info_manager/package.xml
@@ -1,6 +1,6 @@
<package>
<name>camera_info_manager</name>
- <version>1.11.9</version>
+ <version>1.11.10</version>
<description>
This package provides a C++ interface for camera calibration
diff --git a/image_common/CHANGELOG.rst b/image_common/CHANGELOG.rst
index 470f18b..6a768f6 100644
--- a/image_common/CHANGELOG.rst
+++ b/image_common/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package image_common
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.10 (2016-01-19)
+--------------------
+
1.11.9 (2016-01-17)
-------------------
diff --git a/image_common/package.xml b/image_common/package.xml
index a85026a..e0b94fd 100644
--- a/image_common/package.xml
+++ b/image_common/package.xml
@@ -1,6 +1,6 @@
<package>
<name>image_common</name>
- <version>1.11.9</version>
+ <version>1.11.10</version>
<description>Common code for working with images in ROS.</description>
<author>Patrick Mihelich</author>
<author>James Bowman</author>
diff --git a/image_transport/CHANGELOG.rst b/image_transport/CHANGELOG.rst
index 4e235ab..87bfe16 100644
--- a/image_transport/CHANGELOG.rst
+++ b/image_transport/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package image_transport
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.10 (2016-01-19)
+--------------------
+
1.11.9 (2016-01-17)
-------------------
* fix linkage in tutorials
diff --git a/image_transport/package.xml b/image_transport/package.xml
index c21263f..42fbf98 100644
--- a/image_transport/package.xml
+++ b/image_transport/package.xml
@@ -1,6 +1,6 @@
<package>
<name>image_transport</name>
- <version>1.11.9</version>
+ <version>1.11.10</version>
<description>
image_transport should always be used to subscribe to and publish images. It provides transparent
diff --git a/polled_camera/CHANGELOG.rst b/polled_camera/CHANGELOG.rst
index 4ce0fbf..5f3f188 100644
--- a/polled_camera/CHANGELOG.rst
+++ b/polled_camera/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package polled_camera
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.10 (2016-01-19)
+--------------------
+
1.11.9 (2016-01-17)
-------------------
diff --git a/polled_camera/package.xml b/polled_camera/package.xml
index e6a209c..a3d543f 100644
--- a/polled_camera/package.xml
+++ b/polled_camera/package.xml
@@ -1,6 +1,6 @@
<package>
<name>polled_camera</name>
- <version>1.11.9</version>
+ <version>1.11.10</version>
<description>
polled_camera contains a service and C++ helper classes for implementing a polled
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-image-common.git
More information about the debian-science-commits
mailing list