[ignition-math2] 01/02: Update gtest system patch

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Mon Nov 28 15:58:18 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-math2.

commit 684e6ba4e9265565e60269b49993b7441b715354
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Nov 28 15:48:25 2016 +0000

    Update gtest system patch
---
 debian/patches/0002_use_system_gtest.patch | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0002_use_system_gtest.patch b/debian/patches/0002_use_system_gtest.patch
index 775bc70..3363769 100644
--- a/debian/patches/0002_use_system_gtest.patch
+++ b/debian/patches/0002_use_system_gtest.patch
@@ -1,6 +1,6 @@
 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: 2016-10-26
 
 Index: ignition-math2-2.1.1/test/CMakeLists.txt
 ===================================================================
@@ -25,3 +25,16 @@ Index: ignition-math2-2.1.1/test/CMakeLists.txt
  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 4bca480..8845a39 100644
+--- a/cmake/Utils.cmake
++++ b/cmake/Utils.cmake
+@@ -147,7 +147,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-math2.git



More information about the debian-science-commits mailing list