Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Thu, 02 Nov 2023 22:53:33 UTC Commit: fb202dc583a9deefa3c17046fd7d5ad23c21e180 https://github.com/geany/geany/commit/fb202dc583a9deefa3c17046fd7d5ad23c21e1...

Log Message: ----------- meson: Only perform macos checks on macos

Fixes #3649.

Modified Paths: -------------- meson.build

Modified: meson.build 18 lines changed, 13 insertions(+), 5 deletions(-) =================================================================== @@ -23,9 +23,6 @@ foreach dep : deps_in deps_for_pc += ' ' + dep[0] + ' >= ' + dep[1] endforeach

-dep_mac_integration = dependency('gtk-mac-integration', version: '>= 3.0.1', - required: get_option('mac-integration')) - glib = deps[0]

# detect libc @@ -735,6 +732,17 @@ if (host_machine.system() == 'windows') endforeach endif

+osx_src = [] +osx_deps = [] +if host_machine.system() == 'darwin' + dep_mac_integration = dependency('gtk-mac-integration', version: '>= 3.0.1', + required: get_option('mac-integration')) + if dep_mac_integration.found() + osx_src += ['src/osx.c', 'src/osx.h'] + osx_deps += [dep_mac_integration] + endif +endif + install_headers( 'plugins/geanyfunctions.h', 'plugins/geanyplugin.h', @@ -851,12 +859,12 @@ libgeany = shared_library('geany', 'src/utils.h', gen_src, win_src, - dep_mac_integration.found() ? ['src/osx.c', 'src/osx.h'] : [], + osx_src, 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"' ], include_directories: [iscintilla], - dependencies: [dep_tagmanager, dep_ctags, dep_scintilla, dep_mac_integration] + deps + win_deps, + dependencies: [dep_tagmanager, dep_ctags, dep_scintilla] + deps + win_deps + osx_deps, install: true ) dep_libgeany = declare_dependency(

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