[ignition-msgs] 02/02: 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 ignition-msgs.

commit 9f5768731efcd10c3b3f1755fa8e0da80962a2d9
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Jul 27 22:46:46 2016 +0000

    Patch to use system gtest
---
 debian/control                             |  1 +
 debian/patches/0001_use_system_gtest.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/control b/debian/control
index 5cc4d86..de4b719 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Priority: extra
 Build-Depends: cmake,
                pkg-config,
                debhelper (>= 9.20151004),
+               libgtest-dev,
                libprotoc-dev,
                libprotobuf-dev (>= 2.3.0),
                libignition-math2-dev,
diff --git a/debian/patches/0001_use_system_gtest.patch b/debian/patches/0001_use_system_gtest.patch
new file mode 100644
index 0000000..f14a20c
--- /dev/null
+++ b/debian/patches/0001_use_system_gtest.patch
@@ -0,0 +1,27 @@
+Description: Use system packaged gtest
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Last-Update: 2016-07-27
+
+Index: ignition-msgs/test/CMakeLists.txt
+===================================================================
+--- ignition-msgs.orig/test/CMakeLists.txt
++++ ignition-msgs/test/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ include_directories (
+-  ${PROJECT_SOURCE_DIR}/test/gtest/include
+-  ${PROJECT_SOURCE_DIR}/test/gtest
++  /usr/include
++  /usr/src/gtest
+   ${PROJECT_SOURCE_DIR}/test
+ )
+ 
+ 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
new file mode 100644
index 0000000..cb3f805
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_use_system_gtest.patch

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