Merge lp:~ahayzen/ubuntu-weather-app/fix-duplicate-resources into lp:ubuntu-weather-app

Proposed by Andrew Hayzen on 2017-01-12
Status: Merged
Approved by: Andrew Hayzen on 2017-01-26
Approved revision: 257
Merged at revision: 260
Proposed branch: lp:~ahayzen/ubuntu-weather-app/fix-duplicate-resources
Merge into: lp:ubuntu-weather-app
Diff against target: 11 lines (+1/-0)
1 file modified
CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-weather-app/fix-duplicate-resources
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2017-01-26
Andrew Hayzen Approve on 2017-01-26
Review via email: mp+314621@code.launchpad.net

Commit message

* Set UBUNTU-WEATHER_APP_DIR so that resources are duplicated in snap mode

Description of the change

* Set UBUNTU-WEATHER_APP_DIR so that resources are duplicated in snap mode

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

This is in the snap edge channel so going to approve.

review: Approve
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 2016-01-06 03:06:55 +0000
3+++ CMakeLists.txt 2017-01-12 14:09:55 +0000
4@@ -69,6 +69,7 @@
5 DESTINATION ${CMAKE_INSTALL_BINDIR})
6 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
7 set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
8+ set(UBUNTU-WEATHER_APP_DIR "${DATA_DIR}/app")
9 endif(CLICK_MODE)
10
11 if(${CLICK_MODE})

Subscribers

People subscribed via source and target branches

to all changes: