Ubuntu Clock App

Merge lp:~ubuntu-clock-dev/ubuntu-clock-app/switch-to-set-cmake into lp:ubuntu-clock-app

  1. switch-to-set-cmake
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 325
Merged at revision: 324
Proposed branch: lp:~ubuntu-clock-dev/ubuntu-clock-app/switch-to-set-cmake
Merge into: lp:ubuntu-clock-app
Diff against target: 111 lines (+54/-7)
6 files modified
app/alarm/CMakeLists.txt (+12/-1)
app/clock/CMakeLists.txt (+4/-1)
app/components/CMakeLists.txt (+13/-1)
app/graphics/CMakeLists.txt (+11/-2)
app/upstreamcomponents/CMakeLists.txt (+8/-1)
app/worldclock/CMakeLists.txt (+6/-1)
To merge this branch: bzr merge lp:~ubuntu-clock-dev/ubuntu-clock-app/switch-to-set-cmake
Reviewer Review Type Date Requested Status
Bartosz Kosiorek Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Abstain
Review via email: mp+267677@code.launchpad.net

Commit message

Switched GLOB to Set in the cmake files

Description of the change

Switched GLOB to Set in the cmake files.

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

The Graphics directory still hasn't been switched to Set(). @Bartosz can you do that. Somehow the files are not shown in Qtcreator.

review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:324
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/732/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/77

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/732/rebuild

review: Approve (continuous-integration)
lp:~ubuntu-clock-dev/ubuntu-clock-app/switch-to-set-cmake updated
325. By Nekhelesh Ramananthan

Fixed Graphics file cmake

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Fixed the graphics file not showing.

review: Abstain
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:325
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/733/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/78

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/733/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

It is working perfectly for me.
Thanks Nekhelesh.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/alarm/CMakeLists.txt'
--- app/alarm/CMakeLists.txt 2014-08-07 20:47:53 +0000
+++ app/alarm/CMakeLists.txt 2015-08-11 16:05:23 +0000
@@ -1,4 +1,15 @@
1file(GLOB ALARM_QML_JS_FILES *.qml *.js)1set(ALARM_QML_JS_FILES
2 AlarmDelegate.qml
3 AlarmLabel.qml
4 AlarmList.qml
5 AlarmModelComponent.qml
6 AlarmPage.qml
7 AlarmRepeat.qml
8 AlarmSettingsPage.qml
9 AlarmSound.qml
10 AlarmUtils.qml
11 EditAlarmPage.qml
12)
213
3# make the files visible in the qtcreator tree14# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-clock-app_alarm_QMlFiles ALL SOURCES ${ALARM_QML_JS_FILES})15add_custom_target(ubuntu-clock-app_alarm_QMlFiles ALL SOURCES ${ALARM_QML_JS_FILES})
516
=== modified file 'app/clock/CMakeLists.txt'
--- app/clock/CMakeLists.txt 2014-08-07 20:47:53 +0000
+++ app/clock/CMakeLists.txt 2015-08-11 16:05:23 +0000
@@ -1,4 +1,7 @@
1file(GLOB CLOCK_QML_JS_FILES *.qml *.js)1set(CLOCK_QML_JS_FILES
2 ClockPage.qml
3 MainClock.qml
4)
25
3# make the files visible in the qtcreator tree6# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-clock-app_clock_QMlFiles ALL SOURCES ${CLOCK_QML_JS_FILES})7add_custom_target(ubuntu-clock-app_clock_QMlFiles ALL SOURCES ${CLOCK_QML_JS_FILES})
58
=== modified file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt 2014-08-07 20:47:53 +0000
+++ app/components/CMakeLists.txt 2015-08-11 16:05:23 +0000
@@ -1,4 +1,16 @@
1file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)1set(COMPONENTS_QML_JS_FILES
2 AnalogMode.qml
3 AnalogShadow.qml
4 Background.qml
5 Clock.qml
6 ClockCircle.qml
7 DigitalMode.qml
8 DigitalShadow.qml
9 EmptyState.qml
10 ExpandableListItem.qml
11 Shadow.qml
12 SubtitledListItem.qml
13)
214
3# make the files visible in the qtcreator tree15# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-clock-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})16add_custom_target(ubuntu-clock-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
517
=== modified file 'app/graphics/CMakeLists.txt'
--- app/graphics/CMakeLists.txt 2014-09-04 00:00:20 +0000
+++ app/graphics/CMakeLists.txt 2015-08-11 16:05:23 +0000
@@ -1,8 +1,17 @@
1file(GLOB GRAPHICS_FILES *.png *.jpg *.svg)1set(GRAPHICS_FILES
2 Background_Texture.jpg
3 Hour_Hand@27.png
4 Inner_Clock_Texture.png
5 Knob@27.png
6 Minute_Hand@27.png
7 Second_Hand@27.png
8 select-none.svg
9 select.svg
10)
211
3# make the files visible in the qtcreator tree12# make the files visible in the qtcreator tree
4if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")13if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
5 add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${IMAGES_PNG_FILES})14 add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${GRAPHICS_FILES})
6endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")15endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
716
8install(FILES ${GRAPHICS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/graphics)17install(FILES ${GRAPHICS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/graphics)
918
=== modified file 'app/upstreamcomponents/CMakeLists.txt'
--- app/upstreamcomponents/CMakeLists.txt 2014-08-08 10:08:43 +0000
+++ app/upstreamcomponents/CMakeLists.txt 2015-08-11 16:05:23 +0000
@@ -1,4 +1,11 @@
1file(GLOB UPSTREAM_COMPONENTS_QML_JS_FILES *.qml *.js)1set(UPSTREAM_COMPONENTS_QML_JS_FILES
2 FakeHeader.qml
3 FastScroll.js
4 FastScroll.qml
5 ListItemWithActions.qml
6 ListItemWithActionsCheckBox.qml
7 PageWithBottomEdge.qml
8)
29
3# make the files visible in the qtcreator tree10# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-clock-app_upstream_components_QMlFiles ALL SOURCES ${UPSTREAM_COMPONENTS_QML_JS_FILES})11add_custom_target(ubuntu-clock-app_upstream_components_QMlFiles ALL SOURCES ${UPSTREAM_COMPONENTS_QML_JS_FILES})
512
=== modified file 'app/worldclock/CMakeLists.txt'
--- app/worldclock/CMakeLists.txt 2014-08-07 20:47:53 +0000
+++ app/worldclock/CMakeLists.txt 2015-08-11 16:05:23 +0000
@@ -1,4 +1,9 @@
1file(GLOB WORLDCLOCK_QML_JS_FILES *.xml *.qml *.js)1set(WORLDCLOCK_QML_JS_FILES
2 AddWorldCityButton.qml
3 UserWorldCityDelegate.qml
4 UserWorldCityList.qml
5 WorldCityList.qml
6)
27
3# make the files visible in the qtcreator tree8# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-clock-app_worldclock_QMlFiles ALL SOURCES ${WORLDCLOCK_QML_JS_FILES})9add_custom_target(ubuntu-clock-app_worldclock_QMlFiles ALL SOURCES ${WORLDCLOCK_QML_JS_FILES})

Subscribers

People subscribed via source and target branches

to all changes: