[gazebo] 04/07: Added patch to use system gtest

[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 gazebo.

commit d70b54b41acc2828f2960b3f80a99245e8d948c1
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Sun Aug 2 21:23:46 2015 +0000

    Added patch to use system gtest
---
 debian/patches/0002_use_system_gtest.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0002_use_system_gtest.patch b/debian/patches/0002_use_system_gtest.patch
new file mode 100644
index 0000000..3b902b0
--- /dev/null
+++ b/debian/patches/0002_use_system_gtest.patch
@@ -0,0 +1,26 @@
+Description: Use system packaged gtest
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Last-Update: 2015-08-02
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 975bed1..4873a7a 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,4 +1,6 @@
+ include_directories (
++  /usr/include
++  /usr/src/gtest
+   ${ODE_INCLUDE_DIRS}
+   ${OPENGL_INCLUDE_DIR}
+   ${OGRE_INCLUDE_DIRS}
+@@ -24,8 +26,8 @@ endif()
+ configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/test_config.h)
+ 
+ # Build gtest
+-add_library(gtest STATIC gtest/src/gtest-all.cc)
+-add_library(gtest_main STATIC gtest/src/gtest_main.cc)
++add_library(gtest STATIC /usr/src/gtest/src/gtest-all.cc)
++add_library(gtest_main STATIC /usr/src/gtest/src/gtest_main.cc)
+ target_link_libraries(gtest_main gtest)
+ set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
+ set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")
diff --git a/debian/patches/series b/debian/patches/series
index cf315e2..a9ad18e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0002_use_system_gtest.patch
 0005-fix-problems-on-manpage.patch
 0008-arial-font-removed-in-dfsg.patch

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