[med-svn] [opensurgsim] 01/02: Fix FTBFS when building with newest googletest.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository opensurgsim.

commit dc7be5e4f1afd211bdca23c23218087addef6cfc
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Mon Dec 5 08:43:48 2016 +0000

    Fix FTBFS when building with newest googletest.
    
    - Build depends on new unified googletest package.
    - Inject path to googlemock via GOOGLEMOCK_DIR.
    - Exclude gtest / gmock artefacts from install.
    
    Gbp-Dch: full
    Closes: #844874
    Thanks: Lucas Nussbaum for reporting
---
 debian/control | 2 +-
 debian/rules   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 621c32c..3ebbe51 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
                cmake,
                doxygen,
                libeigen3-dev,
-               google-mock,
+               googletest,
                libjs-jquery,
                libjs-mathjax,
                libopenscenegraph-dev,
diff --git a/debian/rules b/debian/rules
index 0c89f2f..5e3b850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=-format,+bindnow
+export GOOGLEMOCK_DIR = /usr/src/googletest/googlemock
 
 %:
 	dh $@ --parallel --with linktree
@@ -30,3 +31,5 @@ override_dh_auto_configure:
 	-DEIGEN_ALIGNMENT=$(EIGEN_ALIGNMENT) \
 	-DUSE_SYSTEM_YAMLCPP:BOOL=ON
 
+override_dh_install:
+	dh_install --exclude=gmock --exclude=gtest

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/opensurgsim.git