[ros-catkin] 01/02: Add patch for gtest

[Jochen Sprickerhof]

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

jspricke pushed a commit to branch master
in repository ros-catkin.

commit 359efad989f1e6a186b1e8d47926f46dfc9306d8
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Nov 13 22:43:55 2016 +0100

    Add patch for gtest
    
    Closes: #844199
---
 ...8-Add-targets-for-gtest-libraries-locally.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0008-Add-targets-for-gtest-libraries-locally.patch b/debian/patches/0008-Add-targets-for-gtest-libraries-locally.patch
new file mode 100644
index 0000000..f5ef3b9
--- /dev/null
+++ b/debian/patches/0008-Add-targets-for-gtest-libraries-locally.patch
@@ -0,0 +1,26 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Sun, 13 Nov 2016 22:41:28 +0100
+Subject: Add targets for gtest libraries locally
+
+The CMakeLists.txt of gtest adds install targets for the gtest libraries
+and includes. Instead of doing add_subdirectory(), this adds the needed
+libraries directly.
+---
+ cmake/test/gtest.cmake | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/test/gtest.cmake b/cmake/test/gtest.cmake
+index f9c5ff5..e149dc4 100644
+--- a/cmake/test/gtest.cmake
++++ b/cmake/test/gtest.cmake
+@@ -117,7 +117,9 @@ if(NOT GTEST_FOUND)
+       get_filename_component(_CATKIN_GTEST_BASE_DIR ${_CATKIN_GTEST_SOURCE_DIR} PATH)
+       # add CMakeLists.txt from gtest dir
+       set(_CATKIN_GTEST_BINARY_DIR ${CMAKE_BINARY_DIR}/gtest)
+-      add_subdirectory(${_CATKIN_GTEST_BASE_DIR} ${_CATKIN_GTEST_BINARY_DIR})
++      add_library(gtest SHARED ${_CATKIN_GTEST_SOURCE_DIR}/gtest-all.cc)
++      target_include_directories(gtest PRIVATE ${_CATKIN_GTEST_BASE_DIR})
++      add_library(gtest_main SHARED ${_CATKIN_GTEST_SOURCE_DIR}/gtest_main.cc)
+       # mark gtest targets with EXCLUDE_FROM_ALL to only build when tests are built which depend on them
+       set_target_properties(gtest gtest_main PROPERTIES EXCLUDE_FROM_ALL 1)
+       get_filename_component(_CATKIN_GTEST_INCLUDE_DIR ${_CATKIN_GTEST_INCLUDE} PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 0d3bee8..72c3f5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Use-profile.d-in-usr-in-_setup_util.py.patch
 0006-use-GNUInstallDirs-when-installing-into-usr.patch
 0007-Don-t-export-development-path-to-release-package.patch
+0008-Add-targets-for-gtest-libraries-locally.patch

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