[ignition-transport] 01/01: Fix patch to keep test compilation running
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Wed Nov 18 20:40:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository ignition-transport.
commit d856beb0e02a113312e19e3587976905ecc9aa24
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Wed Nov 18 20:40:34 2015 +0000
Fix patch to keep test compilation running
---
debian/patches/0004_use_system_gtest.patch | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/debian/patches/0004_use_system_gtest.patch b/debian/patches/0004_use_system_gtest.patch
index 22e9b60..4f9dc54 100644
--- a/debian/patches/0004_use_system_gtest.patch
+++ b/debian/patches/0004_use_system_gtest.patch
@@ -1,19 +1,21 @@
Description: Use system packaged gtest
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-06-01
+Author: Anton Gladky <gladk at debian.org>, Jose Luis Rivero <jrivero at osrfoundation.org>
+Last-Update: 2015-11-18
---- ignition-transport-0.8.1+dfsg1.orig/test/CMakeLists.txt
-+++ ignition-transport-0.8.1+dfsg1/test/CMakeLists.txt
-@@ -1,15 +1,13 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 974f01d..b0bff1f 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,6 +1,6 @@
include_directories (
- ${PROJECT_SOURCE_DIR}/test/gtest/include
- ${PROJECT_SOURCE_DIR}/test/gtest
-- ${PROJECT_SOURCE_DIR}/test
-- ${PROJECT_BINARY_DIR}
+ /usr/include
+ /usr/src/gtest
+ ${PROJECT_SOURCE_DIR}/test
+ ${PROJECT_BINARY_DIR}
)
-
+@@ -8,8 +8,8 @@ include_directories (
configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/include/ignition/transport/test_config.h)
# Build gtest
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ignition-transport.git
More information about the debian-science-commits
mailing list