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

[Nekhelesh Ramananthan]

Switched GLOB to Set in the cmake files

Switched GLOB to Set in the cmake files.

[Nekhelesh Ramananthan (nik90)]

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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]

325. By Nekhelesh Ramananthan on 2015-08-11

Fixed Graphics file cmake

[Nekhelesh Ramananthan (nik90)]

Fixed the graphics file not showing.

review: Abstain

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Bartosz Kosiorek (gang65)]

It is working perfectly for me.
Thanks Nekhelesh.

review: Approve

=== 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 @@
-file(GLOB ALARM_QML_JS_FILES *.qml *.js)
+set(ALARM_QML_JS_FILES
+    AlarmDelegate.qml
+    AlarmLabel.qml
+    AlarmList.qml
+    AlarmModelComponent.qml
+    AlarmPage.qml
+    AlarmRepeat.qml
+    AlarmSettingsPage.qml
+    AlarmSound.qml
+    AlarmUtils.qml
+    EditAlarmPage.qml
+)
 
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_alarm_QMlFiles ALL SOURCES ${ALARM_QML_JS_FILES})

=== 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 @@
-file(GLOB CLOCK_QML_JS_FILES *.qml *.js)
+set(CLOCK_QML_JS_FILES
+    ClockPage.qml
+    MainClock.qml
+)
 
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_clock_QMlFiles ALL SOURCES ${CLOCK_QML_JS_FILES})

=== 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 @@
-file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
+set(COMPONENTS_QML_JS_FILES
+    AnalogMode.qml
+    AnalogShadow.qml
+    Background.qml
+    Clock.qml
+    ClockCircle.qml
+    DigitalMode.qml
+    DigitalShadow.qml
+    EmptyState.qml
+    ExpandableListItem.qml
+    Shadow.qml
+    SubtitledListItem.qml
+)
 
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})

=== 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 @@
-file(GLOB GRAPHICS_FILES *.png *.jpg *.svg)
+set(GRAPHICS_FILES
+    Background_Texture.jpg
+    [e-mail]
+    Inner_Clock_Texture.png
+    [e-mail]
+    [e-mail]
+    [e-mail]
+    select-none.svg
+    select.svg
+)
 
 # make the files visible in the qtcreator tree
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${IMAGES_PNG_FILES})
+  add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${GRAPHICS_FILES})
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
 install(FILES ${GRAPHICS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/graphics)

=== 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 @@
-file(GLOB UPSTREAM_COMPONENTS_QML_JS_FILES *.qml *.js)
+set(UPSTREAM_COMPONENTS_QML_JS_FILES
+    FakeHeader.qml
+    FastScroll.js
+    FastScroll.qml
+    ListItemWithActions.qml
+    ListItemWithActionsCheckBox.qml
+    PageWithBottomEdge.qml
+)
 
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_upstream_components_QMlFiles ALL SOURCES ${UPSTREAM_COMPONENTS_QML_JS_FILES})

=== 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 @@
-file(GLOB WORLDCLOCK_QML_JS_FILES *.xml *.qml *.js)
+set(WORLDCLOCK_QML_JS_FILES
+    AddWorldCityButton.qml
+    UserWorldCityDelegate.qml
+    UserWorldCityList.qml
+    WorldCityList.qml
+)
 
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_worldclock_QMlFiles ALL SOURCES ${WORLDCLOCK_QML_JS_FILES})