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

[Andrew Hayzen]

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

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

[Andrew Hayzen (ahayzen)]

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

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-06 03:06:55 +0000
+++ CMakeLists.txt	2017-01-12 14:09:55 +0000
@@ -69,6 +69,7 @@
     DESTINATION ${CMAKE_INSTALL_BINDIR})
   set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
   set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
+  set(UBUNTU-WEATHER_APP_DIR "${DATA_DIR}/app")
 endif(CLICK_MODE)
 
 if(${CLICK_MODE})