From 278fb845b25c510b71fd1810aa09d59da4abb41e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Moreno?= <danigm@wadobo.com>
Date: Wed, 8 Nov 2017 13:37:20 +0100
Subject: [PATCH] Better meson.build file to compile with cargo

---
 configure        |  9 +--------
 meson.build      | 11 ++++++-----
 scripts/cargo.sh |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index 4f4f1a97..19525725 100755
--- a/configure
+++ b/configure
@@ -81,10 +81,6 @@ sanitycheck MESON 'meson'
 sanitycheck MESONTEST 'mesontest'
 sanitycheck NINJA 'ninja' 'ninja-build'
 
-declare -A default_options=(
-    ['introspection']=true
-)
-
 declare -A meson_options
 
 while (($# > 0)); do
@@ -137,7 +133,7 @@ cat > Makefile <<END
 # Generated by configure; do not edit
 
 all:
-	${NINJA} ${NINJA_OPT} cargo
+	${NINJA} ${NINJA_OPT}
 
 install:
 	DESTDIR="\$(DESTDIR)" ${NINJA} ${NINJA_OPT} install
@@ -157,9 +153,6 @@ echo "
         meson:         ${MESON}
         ninja:         ${NINJA}
         prefix:        ${prefix}
-        compiler:      ${CC}
-        global flags:  ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
-        introspection: $(echooption introspection)
 
         Now type 'make' to build
 "
diff --git a/meson.build b/meson.build
index 87fbce99..308a4f4b 100644
--- a/meson.build
+++ b/meson.build
@@ -21,10 +21,11 @@ install_data('res/main_window.glade', install_dir : fractal_datadir)
 install_data('res/fractal.svg', install_dir : get_option('datadir') + '/icons')
 install_data('res/org.gnome.Fractal.desktop', install_dir : get_option('datadir') + '/applications')
 
-cargo = find_program('cargo')
+cargo = find_program('cargo', required: false)
+cargo_script = find_program('scripts/cargo.sh')
 cargo_release = custom_target('cargo-build',
+                        build_by_default: true,
                         output: ['fractal'],
-                        install: false,
-                        command: ['FRACTAL_RES=' + fractal_datadir, cargo, 'build', '--release'])
-run_target('cargo', command: 'scripts/cargo.sh', depends: [cargo_release])
-install_data('target/release/fractal', install_dir : fractal_bindir)
+                        install: true,
+                        install_dir: fractal_bindir,
+                        command: ['FRACTAL_RES=' + fractal_datadir, cargo_script, '@CURRENT_SOURCE_DIR@', '@OUTPUT@'])
diff --git a/scripts/cargo.sh b/scripts/cargo.sh
index af367f64..f7930e13 100755
--- a/scripts/cargo.sh
+++ b/scripts/cargo.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-echo "build completed"
+cargo build --release && cp $1/target/release/fractal $2