[ignition-transport] 01/01: Fix use system gtest patch
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Mon Nov 28 11:40:05 UTC 2016
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 e03d2d155d4375f4f24ffdb3bf15d67b543e38a7
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Mon Nov 28 11:32:57 2016 +0000
Fix use system gtest patch
---
debian/patches/0004_use_system_gtest.patch | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/debian/patches/0004_use_system_gtest.patch b/debian/patches/0004_use_system_gtest.patch
index 4f9dc54..61ef65d 100644
--- a/debian/patches/0004_use_system_gtest.patch
+++ b/debian/patches/0004_use_system_gtest.patch
@@ -26,3 +26,15 @@ index 974f01d..b0bff1f 100644
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/cmake/Utils.cmake b/cmake/Utils.cmake
+index d04352d..0eb7efe 100644
+--- a/cmake/Utils.cmake
++++ b/cmake/Utils.cmake
+@@ -146,7 +146,6 @@ endmacro()
+ # This should be migrated to more fine control solution based on set_property APPEND
+ # directories. It's present on cmake 2.8.8 while precise version is 2.8.7
+ link_directories(${PROJECT_BINARY_DIR}/test)
+-include_directories("${PROJECT_SOURCE_DIR}/test/gtest/include")
+
+ #################################################
+ # Enable tests compilation by default
--
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