← Back to branch summary

~lukas-kde/qtmir/cleanups

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bileto Bot
  • Author(s): Gerry Boland
  • Date: 2016-11-23 20:44:30 UTC
  • mfrom: (569.1.7 qtmir)
  • Revision ID: ci-train-bot@canonical.com-20161123204430-gsm6y2khe8lb4mxl
Fix FTBFS due to new googletest framework release (1.8)

- needed to update the gmock-fixes.h to add Unwrap() support
- small signed/unsigned comparison fix flagged by GTest

Approved by: Daniel d'Andrada

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
55
55
 
56
56
override_dh_install:
57
57
ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 
58
        #clean gmock/gtest if it built in our build dir
 
59
        -rm -f $(TMP1_DIR)/usr/lib/libgmock*.a $(TMP1_DIR)/usr/lib/libgtest*.a
 
60
        -rm -rf $(TMP1_DIR)/usr/include/gmock $(TMP1_DIR)/usr/include/gtest
58
61
        dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android
59
62
endif
 
63
        #clean gmock/gtest if it built in our build dir
 
64
        -rm -f $(TMP2_DIR)/usr/lib/libgmock*.a $(TMP2_DIR)/usr/lib/libgtest*.a
 
65
        -rm -rf $(TMP2_DIR)/usr/include/gmock $(TMP2_DIR)/usr/include/gtest
60
66
        dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop
61
67
        dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin
62
68
        dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests