[geany/geany] 37d20a: Merge pull request #3194 from techee/meson

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   GitHub <noreply at github.com>
Date:        Fri, 13 May 2022 00:51:34 UTC
Commit:      37d20a823fb1bca67cea57ef73aa9e64009d8138
             https://github.com/geany/geany/commit/37d20a823fb1bca67cea57ef73aa9e64009d8138

Log Message:
-----------
Merge pull request #3194 from techee/meson

Support gtk-mac-integration by meson build


Modified Paths:
--------------
    meson.build
    meson_options.txt

Modified: meson.build
4 lines changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -23,6 +23,9 @@ foreach dep : deps_in
 	deps_for_pc += ' ' + dep[0] + ' >= ' + dep[1]
 endforeach
 
+mac_integration = dependency('gtk-mac-integration', version: '>= 3.0.1',
+	required: get_option('mac-integration'))
+
 glib = deps[0]
 
 # detect libc
@@ -845,6 +848,7 @@ libgeany = shared_library('geany',
 	'src/utils.h',
 	gen_src,
 	win_src,
+	mac_integration.found() ? ['src/osx.c', 'src/osx.h'] : [],
 	host_machine.system() == 'windows' ? ['src/win32.c',  'src/win32.h'] : [ 'src/vte.c', 'src/vte.h' ],
 	soversion: '0',
 	c_args: geany_cflags + [ '-DG_LOG_DOMAIN="Geany"' ],


Modified: meson_options.txt
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -6,3 +6,4 @@ option('api-docs', type : 'feature', description : 'enable to generate API docum
 option('gtkdoc', type : 'boolean', description : 'enable to generate gtk-doc compatible headers for the API')
 option('python-command', type: 'string', description: 'the default Python command')
 option('socket', type: 'boolean', description: 'enable if you want to detect a running instance')
+option('mac-integration', type: 'feature', description: 'enable for improved macOS integration using the gtk-mac-integration library')



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).