Merge lp:~pete-woods/libqtdbustest/fix-wily-build into lp:libqtdbustest

Proposed by Pete Woods on 2015-09-18
Status: Merged
Approved by: Pete Woods on 2015-09-18
Approved revision: 37
Merged at revision: 37
Proposed branch: lp:~pete-woods/libqtdbustest/fix-wily-build
Merge into: lp:libqtdbustest
Diff against target: 54 lines (+1/-23)
3 files modified
cmake/FindGMock.cmake (+0/-10)
debian/control (+1/-1)
debian/rules (+0/-12)
To merge this branch: bzr merge lp:~pete-woods/libqtdbustest/fix-wily-build
Reviewer Review Type Date Requested Status
Unity Team 2015-09-18 Pending
Review via email: mp+271627@code.launchpad.net

Commit message

Fix building on wily

Description of the change

Fix building on wily

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'cmake/FindGMock.cmake'
2--- cmake/FindGMock.cmake 2013-07-24 09:42:07 +0000
3+++ cmake/FindGMock.cmake 1970-01-01 00:00:00 +0000
4@@ -1,10 +0,0 @@
5-# Build with system gmock and embedded gtest
6-set (GMOCK_INCLUDE_DIRS "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
7-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
8-set (GTEST_INCLUDE_DIRS "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
9-
10-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
11-
12-set(GTEST_LIBRARIES gtest)
13-set(GTEST_MAIN_LIBRARIES gtest_main)
14-set(GMOCK_LIBRARIES gmock gmock_main)
15
16=== modified file 'debian/control'
17--- debian/control 2014-01-02 11:35:43 +0000
18+++ debian/control 2015-09-18 09:57:24 +0000
19@@ -3,12 +3,12 @@
20 Priority: optional
21 Maintainer: Ubuntu Developers <ubunu-devel.discuss@lists.ubuntu.com>
22 Build-Depends: cmake,
23+ cmake-extras,
24 debhelper (>= 9),
25 gettext,
26 google-mock (>= 1.6.0+svn437),
27 pkg-config,
28 qtbase5-dev,
29- valgrind [!arm64 !ppc64el],
30 python3-dbusmock,
31 dbus,
32 Standards-Version: 3.9.4
33
34=== modified file 'debian/rules'
35--- debian/rules 2014-03-03 12:43:49 +0000
36+++ debian/rules 2015-09-18 09:57:24 +0000
37@@ -3,17 +3,5 @@
38
39 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
40
41-ifeq ($(DEB_HOST_ARCH),armhf)
42- ENABLE_MEMCHECK_OPTION = OFF
43-else
44- ENABLE_MEMCHECK_OPTION = ON
45-endif
46-
47 %:
48 dh $@ --parallel --fail-missing
49-
50-override_dh_auto_configure:
51- dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
52-
53-override_dh_makeshlibs:
54- dh_makeshlibs -V

Subscribers

People subscribed via source and target branches

to all changes: