Merge lp:~gerboland/platform-api/zesty-gtest-fix into lp:platform-api

Proposed by Gerry Boland on 2017-02-07
Status: Merged
Approved by: Michał Sawicz on 2017-02-16
Approved revision: 332
Merged at revision: 332
Proposed branch: lp:~gerboland/platform-api/zesty-gtest-fix
Merge into: lp:platform-api
Diff against target: 14 lines (+4/-0)
1 file modified
debian/rules (+4/-0)
To merge this branch: bzr merge lp:~gerboland/platform-api/zesty-gtest-fix
Reviewer Review Type Date Requested Status
Michał Sawicz 2017-02-07 Approve on 2017-02-16
Review via email: mp+316593@code.launchpad.net

Commit message

[deb] Add workaround for gmock/gtest build files being left in install dir

To post a comment you must log in.
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2015-07-15 19:23:50 +0000
3+++ debian/rules 2017-02-07 17:59:00 +0000
4@@ -11,6 +11,10 @@
5 dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
6
7 override_dh_install:
8+ #clean gmock/gtest if it built in our build dir
9+ rm -f debian/tmp/usr/lib/libgmock*.a debian/tmp/usr/lib/libgtest*.a
10+ rm -rf debian/tmp/usr/include/gmock debian/tmp/usr/include/gtest
11+
12 dh_install --fail-missing
13
14 override_dh_auto_test:

Subscribers

People subscribed via source and target branches