platform-api

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

  1. zesty-gtest-fix
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Michał Sawicz
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 Approve
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.
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches