Unity 8

Merge lp:~aacid/unity8/less_repeated_stuff_cmake into lp:unity8

  1. less_repeated_stuff_cmake
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Zanetti
Approved revision: 187
Merged at revision: 188
Proposed branch: lp:~aacid/unity8/less_repeated_stuff_cmake
Merge into: lp:unity8
Diff against target: 82 lines (+1/-26)
6 files modified
CMakeLists.txt (+1/-0)
plugins/Ubuntu/Gestures/CMakeLists.txt (+0/-6)
tests/mocks/HudClient/CMakeLists.txt (+0/-5)
tests/mocks/Ubuntu/Application/CMakeLists.txt (+0/-6)
tests/mocks/Unity/CMakeLists.txt (+0/-5)
tests/utils/modules/Unity/Test/CMakeLists.txt (+0/-4)
To merge this branch: bzr merge lp:~aacid/unity8/less_repeated_stuff_cmake
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Approve
Review via email: mp+179875@code.launchpad.net

Commit message

Remove unneeded stuff from CMakelists.txt

set(CMAKE_AUTOMOC ON)

include(FindPkgConfig)
find_package(Qt5Core REQUIRED)
find_package(Qt5Quick REQUIRED)

Are already on the top-level CMakeLists.txt so no need to write them again
Well, actually the Qt5Core wasn't and i added it, it's not really necessary
since it's pulled by the others that depend on it, but it doesn't hurt to be
explicit

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

still builds fine for me. As we agreed that plugins must not be self-contained at this point in time, I'll approve

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity8-ci/584/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/585
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/584
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2145
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2145/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1822

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/584/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-07-19 16:22:50 +0000
+++ CMakeLists.txt 2013-08-13 09:14:35 +0000
@@ -48,6 +48,7 @@
48 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)48 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
4949
50include(FindPkgConfig)50include(FindPkgConfig)
51find_package(Qt5Core)
51find_package(Qt5Qml)52find_package(Qt5Qml)
52find_package(Qt5Quick)53find_package(Qt5Quick)
53find_package(Qt5Gui)54find_package(Qt5Gui)
5455
=== modified file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
--- plugins/Ubuntu/Gestures/CMakeLists.txt 2013-07-08 15:12:28 +0000
+++ plugins/Ubuntu/Gestures/CMakeLists.txt 2013-08-13 09:14:35 +0000
@@ -1,12 +1,6 @@
1# export_qmlplugin macro1# export_qmlplugin macro
2include(Plugins)2include(Plugins)
33
4set(CMAKE_AUTOMOC ON)
5
6include(FindPkgConfig)
7find_package(Qt5Core REQUIRED)
8find_package(Qt5Quick REQUIRED)
9
10set(UbuntuGestureQml_SOURCES4set(UbuntuGestureQml_SOURCES
11 plugin.cpp5 plugin.cpp
12 AxisVelocityCalculator.cpp6 AxisVelocityCalculator.cpp
137
=== modified file 'tests/mocks/HudClient/CMakeLists.txt'
--- tests/mocks/HudClient/CMakeLists.txt 2013-06-05 22:03:08 +0000
+++ tests/mocks/HudClient/CMakeLists.txt 2013-08-13 09:14:35 +0000
@@ -1,8 +1,3 @@
1set(CMAKE_AUTOMOC ON)
2
3include(FindPkgConfig)
4find_package(Qt5Core REQUIRED)
5find_package(Qt5Quick REQUIRED)
6pkg_search_module(DEE dee-1.0 REQUIRED)1pkg_search_module(DEE dee-1.0 REQUIRED)
7pkg_search_module(GOBJECT gobject-2.0 REQUIRED)2pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
8pkg_search_module(HUDCLIENT hud-client-2 REQUIRED)3pkg_search_module(HUDCLIENT hud-client-2 REQUIRED)
94
=== modified file 'tests/mocks/Ubuntu/Application/CMakeLists.txt'
--- tests/mocks/Ubuntu/Application/CMakeLists.txt 2013-06-26 10:15:58 +0000
+++ tests/mocks/Ubuntu/Application/CMakeLists.txt 2013-08-13 09:14:35 +0000
@@ -1,9 +1,3 @@
1set(CMAKE_AUTOMOC ON)
2
3include(FindPkgConfig)
4find_package(Qt5Core REQUIRED)
5find_package(Qt5Quick REQUIRED)
6
7set(FakeUbuntuApplicationQml_SOURCES1set(FakeUbuntuApplicationQml_SOURCES
8 plugin.cpp2 plugin.cpp
9 ApplicationInfo.cpp3 ApplicationInfo.cpp
104
=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt 2013-07-26 11:10:55 +0000
+++ tests/mocks/Unity/CMakeLists.txt 2013-08-13 09:14:35 +0000
@@ -1,10 +1,5 @@
1set(CMAKE_AUTOMOC ON)
2
3add_subdirectory(Indicators)1add_subdirectory(Indicators)
42
5include(FindPkgConfig)
6find_package(Qt5Core REQUIRED)
7find_package(Qt5Quick REQUIRED)
8pkg_search_module(DEE dee-1.0 REQUIRED)3pkg_search_module(DEE dee-1.0 REQUIRED)
9pkg_search_module(GOBJECT gobject-2.0 REQUIRED)4pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
10pkg_search_module(DEEQT libdee-qt5 REQUIRED)5pkg_search_module(DEEQT libdee-qt5 REQUIRED)
116
=== modified file 'tests/utils/modules/Unity/Test/CMakeLists.txt'
--- tests/utils/modules/Unity/Test/CMakeLists.txt 2013-06-05 22:03:08 +0000
+++ tests/utils/modules/Unity/Test/CMakeLists.txt 2013-08-13 09:14:35 +0000
@@ -1,7 +1,3 @@
1find_package(Qt5Core REQUIRED)
2find_package(Qt5Quick REQUIRED)
3
4set(CMAKE_AUTOMOC ON)
5add_definitions(-DQT_NO_KEYWORDS)1add_definitions(-DQT_NO_KEYWORDS)
62
7set(UnityTestQML_SOURCES3set(UnityTestQML_SOURCES

Subscribers

People subscribed via source and target branches