Merge lp:~canonical-platform-qa/ubuntu-clock-app/whitespaces into lp:ubuntu-clock-app

Proposed by Leo Arias
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 96
Merged at revision: 97
Proposed branch: lp:~canonical-platform-qa/ubuntu-clock-app/whitespaces
Merge into: lp:ubuntu-clock-app
Diff against target: 52 lines (+10/-10)
1 file modified
CMakeLists.txt (+10/-10)
To merge this branch: bzr merge lp:~canonical-platform-qa/ubuntu-clock-app/whitespaces
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+234528@code.launchpad.net

Commit message

Remove whitespaces from CMakeLists.txt.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

lgtm!

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

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 2014-09-08 07:37:22 +0000
3+++ CMakeLists.txt 2014-09-12 18:24:46 +0000
4@@ -23,8 +23,8 @@
5 SET(AUTOPILOT_DIR ubuntu_clock_app)
6 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
7
8-# Standard install paths
9-include(GNUInstallDirs)
10+# Standard install paths
11+include(GNUInstallDirs)
12
13 #set install paths
14 if(CLICK_MODE)
15@@ -35,11 +35,11 @@
16 set(EXEC "qmlscene $@ ${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
17 set(MODULE_PATH ${QT_IMPORTS_DIR})
18 if(NOT BZR_REVNO)
19- execute_process(
20+ execute_process(
21 COMMAND bzr revno
22- OUTPUT_VARIABLE BZR_REVNO
23+ OUTPUT_VARIABLE BZR_REVNO
24 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
25- OUTPUT_STRIP_TRAILING_WHITESPACE
26+ OUTPUT_STRIP_TRAILING_WHITESPACE
27 )
28 endif(NOT BZR_REVNO)
29 if(NOT BZR_SOURCE)
30@@ -48,17 +48,17 @@
31 endif(NOT BZR_SOURCE)
32 else(CLICK_MODE)
33 set(UBUNTU-CLOCK_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-clock-app")
34- execute_process(
35- COMMAND qmake -query QT_INSTALL_QML
36- OUTPUT_VARIABLE QT_IMPORTS_DIR
37- OUTPUT_STRIP_TRAILING_WHITESPACE
38+ execute_process(
39+ COMMAND qmake -query QT_INSTALL_QML
40+ OUTPUT_VARIABLE QT_IMPORTS_DIR
41+ OUTPUT_STRIP_TRAILING_WHITESPACE
42 )
43 set(MODULE_PATH ${QT_IMPORTS_DIR}/ClockApp)
44 endif(CLICK_MODE)
45
46 if(${CLICK_MODE})
47 message("-- Configuring manifest.json")
48-
49+
50 execute_process(
51 COMMAND dpkg-architecture -qDEB_HOST_ARCH
52 OUTPUT_VARIABLE CLICK_ARCH

Subscribers

People subscribed via source and target branches