[ignition-common] 09/11: Update patch

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Thu Aug 10 11:21:12 UTC 2017


This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository ignition-common.

commit 881da26c7d7daccadaaaef702de352ca8bdaab81
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed May 31 14:40:22 2017 +0000

    Update patch
---
 debian/patches/0001_use_system_gtest.patch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/patches/0001_use_system_gtest.patch b/debian/patches/0001_use_system_gtest.patch
index d3b9f05..09e9ce7 100644
--- a/debian/patches/0001_use_system_gtest.patch
+++ b/debian/patches/0001_use_system_gtest.patch
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>, Jose Luis Rivero <jrivero at osrfoundation
 Last-Update: 2016-10-26
 
 diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
-index af11ab9..886ee94 100644
+index 2702f3d..aa76bd0 100644
 --- a/cmake/Utils.cmake
 +++ b/cmake/Utils.cmake
-@@ -168,7 +168,6 @@ endmacro()
+@@ -161,7 +161,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)
@@ -15,18 +15,20 @@ index af11ab9..886ee94 100644
  #################################################
  # Enable tests compilation by default
 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index b40c9d6..1445cf4 100644
+index 38df8a3..0ec67a8 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
-@@ -1,14 +1,14 @@
+@@ -1,6 +1,7 @@
  include_directories (
 -  ${PROJECT_SOURCE_DIR}/test/gtest/include
 -  ${PROJECT_SOURCE_DIR}/test/gtest
 +  /usr/include
 +  /usr/src/gtest
++
    ${PROJECT_SOURCE_DIR}/test
  )
  
+@@ -11,8 +12,8 @@ endif()
  configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/test_config.h)
  
  # Build gtest

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



More information about the debian-science-commits mailing list