Network Menu

Merge lp:~pete-woods/indicator-network/cmake-extras-compatibility into lp:indicator-network

  1. cmake-extras-compatibility
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 654
Merged at revision: 654
Proposed branch: lp:~pete-woods/indicator-network/cmake-extras-compatibility
Merge into: lp:indicator-network
Diff against target: 53 lines (+5/-6)
4 files modified
CMakeLists.txt (+2/-2)
debian/control (+1/-1)
doc/qt/cpp/CMakeLists.txt (+1/-1)
src/connectivity-api/connectivity-qml/CMakeLists.txt (+1/-2)
To merge this branch: bzr merge lp:~pete-woods/indicator-network/cmake-extras-compatibility
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+312928@code.launchpad.net

This proposal supersedes a proposal from 2016-12-09.

Commit message

Compatibility with unversioned cmake-extras modules

Description of the change

Compatibility with unversioned cmake-extras modules

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-09-29 17:17:33 +0000
3+++ CMakeLists.txt 2016-12-12 11:58:40 +0000
4@@ -22,9 +22,9 @@
5 )
6
7 find_package(PkgConfig REQUIRED)
8-include(EnableCoverageReport)
9+find_package(CoverageReport)
10 include(GNUInstallDirs)
11-include(UseGSettings)
12+find_package(GSettings)
13
14 set(GETTEXT_PACKAGE indicator-network)
15 set(LOCALE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/locale")
16
17=== modified file 'debian/control'
18--- debian/control 2016-12-05 18:14:26 +0000
19+++ debian/control 2016-12-12 11:58:40 +0000
20@@ -4,7 +4,7 @@
21 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
22 XSBC-Original-Maintainer: Ken VanDine <ken.vandine@canonical.com>
23 Build-Depends: cmake,
24- cmake-extras (>= 0.4),
25+ cmake-extras (>= 0.10),
26 dbus,
27 debhelper (>= 9.0.0),
28 doxygen,
29
30=== modified file 'doc/qt/cpp/CMakeLists.txt'
31--- doc/qt/cpp/CMakeLists.txt 2015-11-20 13:14:50 +0000
32+++ doc/qt/cpp/CMakeLists.txt 2016-12-12 11:58:40 +0000
33@@ -1,7 +1,7 @@
34
35 add_subdirectory(examples)
36
37-include(UseDoxygen OPTIONAL)
38+find_package(DoxygenBuilder)
39
40 add_doxygen(
41 qtdoc
42
43=== modified file 'src/connectivity-api/connectivity-qml/CMakeLists.txt'
44--- src/connectivity-api/connectivity-qml/CMakeLists.txt 2016-04-27 10:51:24 +0000
45+++ src/connectivity-api/connectivity-qml/CMakeLists.txt 2016-12-12 11:58:40 +0000
46@@ -1,6 +1,5 @@
47
48-include(QmlPlugins)
49-
50+find_package(QmlPlugins)
51 find_package(Qt5Quick REQUIRED)
52
53 include_directories(

Subscribers

People subscribed via source and target branches