Merge lp:~saviq/mircade-snap/no-overlay into lp:mircade-snap

[Michał Sawicz]

[lp:~saviq/mircade-snap/no-overlay]

59. By Michał Sawicz on 2017-05-17

Bump version to indicate this is now built without the overlay

[Alan Griffiths (alan-griffiths)]

Painful, but a necessity.

review: Approve

=== modified file 'snap/snapcraft.yaml'
--- snap/snapcraft.yaml	2017-02-24 22:17:41 +0000
+++ snap/snapcraft.yaml	2017-05-17 20:21:36 +0000
@@ -1,5 +1,5 @@
 name: mircade
-version: 0.2.0
+version: 0.2.1
 summary: Example app on Mir stack
 description: This example can be used as a guide by other mir client snaps to render guis
 confinement: strict
@@ -23,6 +23,23 @@
     default-provider: mir-libs:mir-libs
 
 parts:
+  miral:
+    plugin: cmake
+    source: lp:miral/release
+    configflags:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+    build-attributes:
+     - no-system-libraries
+    build-packages:
+      - build-essential
+      - libfreetype6-dev
+      - libgles2-mesa-dev
+      - libglib2.0-dev
+      - libmirserver-dev
+      - libmirclient-dev
+      - pkg-config
+      - python-pil
+
   games:
     plugin: nil
     stage-packages:
@@ -77,14 +94,16 @@
       - -usr/share/man/
 
   mircade:
+    after: [miral]
     plugin: cmake
     source: https://github.com/AlanGriffiths/mircade.git
+    configflags:
+      - -DCMAKE_CXX_FLAGS="-I$SNAPCRAFT_STAGE/usr/include/miral"
     build-packages:
       - build-essential
       - pkg-config
       - libfreetype6-dev
       - libboost-filesystem-dev
-      - libmirclientcpp-dev
     stage-packages:
       - ttf-ubuntu-font-family
     stage: