ubuntu-touch-coreapps-reviewers team mailing list archive

[Nekhelesh Ramananthan <krnekhelesh@xxxxxxxxx>]

Nekhelesh Ramananthan has proposed merging lp:~ubuntu-clock-dev/ubuntu-clock-app/switch-to-set-cmake into lp:ubuntu-clock-app.

Commit message:
Switched GLOB to Set in the cmake files

Requested reviews:
  Bartosz Kosiorek (gang65)

For more details, see:
https://code.launchpad.net/~ubuntu-clock-dev/ubuntu-clock-app/switch-to-set-cmake/+merge/267677

Switched GLOB to Set in the cmake files.
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

=== modified file 'app/alarm/CMakeLists.txt'
--- app/alarm/CMakeLists.txt	2014-08-07 20:47:53 +0000
+++ app/alarm/CMakeLists.txt	2015-08-11 15:07:07 +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 15:07:07 +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 15:07:07 +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/upstreamcomponents/CMakeLists.txt'
--- app/upstreamcomponents/CMakeLists.txt	2014-08-08 10:08:43 +0000
+++ app/upstreamcomponents/CMakeLists.txt	2015-08-11 15:07:07 +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 15:07:07 +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})