[geary] Fix issues with Meson build when installed.



commit b41d4b334357f63239cb1503cec53f5a9f74f765
Author: Michael James Gratton <mike vee net>
Date:   Wed Dec 13 15:07:11 2017 +1100

    Fix issues with Meson build when installed.
    
    * src/client/meson.build,
      src/engine/meson.build,
      src/sqlite3-unicodesn/meson.build: Build static libraries so they can
      be found when installed.
    
    * src/meson.build: Include GResources in the binary now we are compiling
      static libraries, so the resources can be found when compiled.

 src/client/meson.build            |    4 ++--
 src/engine/meson.build            |    2 +-
 src/meson.build                   |   17 ++++++++++-------
 src/sqlite3-unicodesn/meson.build |    2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/src/client/meson.build b/src/client/meson.build
index 33851bf..938b75c 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -100,7 +100,7 @@ geary_client_vala_sources = files(
 
 geary_client_sources = [
   geary_client_vala_sources,
-  geary_resources[0],
+  geary_resources # Included here so valac can check them
 ]
 
 geary_client_dependencies = [
@@ -134,7 +134,7 @@ if libunity.found()
   geary_client_dependencies += libunity
 endif
 
-geary_client_lib = library('geary-client',
+geary_client_lib = static_library('geary-client',
   geary_client_sources,
   dependencies: geary_client_dependencies,
   include_directories: config_h_dir,
diff --git a/src/engine/meson.build b/src/engine/meson.build
index 7a0913f..1bf4170 100644
--- a/src/engine/meson.build
+++ b/src/engine/meson.build
@@ -331,7 +331,7 @@ geary_engine_dependencies = [
   webkit2gtk,
 ]
 
-geary_engine_lib = library('geary-engine',
+geary_engine_lib = static_library('geary-engine',
   geary_engine_sources,
   dependencies: geary_engine_dependencies,
   link_with: sqlite3_unicodesn_lib,
diff --git a/src/meson.build b/src/meson.build
index 4763e9b..79f7430 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -44,18 +44,21 @@ geary_web_process = library('geary-web-process',
 geary_bin_sources = files(
   join_paths('client', 'application', 'main.vala'),
 )
-geary_bin_sources += geary_compiled_schema
 
+geary_bin_sources += [
+  geary_compiled_schema,
+  geary_resources # Included here so they show up in the executable.
+]
 geary_bin_dependencies = [
-  libmath,
-  gee,
-  gtk,
   gdk,
-  webkit2gtk,
-  libsoup,
-  gmime,
   geary_client_dep,
   geary_engine_dep,
+  gee,
+  gmime,
+  gtk,
+  libmath,
+  libsoup,
+  webkit2gtk,
 ]
 
 geary_bin = executable('geary',
diff --git a/src/sqlite3-unicodesn/meson.build b/src/sqlite3-unicodesn/meson.build
index 4b6cfe5..f802e58 100644
--- a/src/sqlite3-unicodesn/meson.build
+++ b/src/sqlite3-unicodesn/meson.build
@@ -40,7 +40,7 @@ sqlite3_unicodesn_includes = [
   include_directories('libstemmer_c/src_c'),
 ]
 
-sqlite3_unicodesn_lib = library('sqlite3-unicodesn',
+sqlite3_unicodesn_lib = static_library('sqlite3-unicodesn',
   sqlite3_unicodesn_sources,
   dependencies: sqlite,
   c_args: sqlite3_unicodesn_c_flags,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]