[sdformat] 07/07: Fix the patch for use external 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 sdformat.

commit 44cc2135da16304f0dd38fd58dd2fa9b5ff0aee1
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Jul 15 18:23:41 2015 +0000

    Fix the patch for use external gtest
---
 debian/control                             |  3 ++-
 debian/patches/0002_use_system_gtest.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index aaff990..68f9203 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,8 @@ Build-Depends: cmake,
                texlive-fonts-recommended,
                texlive-latex-extra,
                ruby | ruby-interpreter,
-               libignition-math2-dev
+               libignition-math2-dev,
+               libgtest-dev,
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/sdformat.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/sdformat.git
 Homepage: http://sdformat.org
diff --git a/debian/patches/0002_use_system_gtest.patch b/debian/patches/0002_use_system_gtest.patch
new file mode 100644
index 0000000..cc153dc
--- /dev/null
+++ b/debian/patches/0002_use_system_gtest.patch
@@ -0,0 +1,28 @@
+Description: Use system packaged gtest
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Last-Update: 2015-07-15
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 520fcce..acbf20a 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ include_directories (
+-  ${PROJECT_SOURCE_DIR}/include
+-  ${PROJECT_BINARY_DIR}/include
++  /usr/include
++  /usr/src/gtest
+   ${Boost_INCLUDE_DIRS}
+   ${PROJECT_SOURCE_DIR}/test/gtest/include
+   ${PROJECT_SOURCE_DIR}/test/gtest
+@@ -24,8 +24,8 @@ endif()
+ 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
index 667a3d8..d873eff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-c++11-unconditional.patch
+0002_use_system_gtest.patch

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