diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-11-22 15:11:08 +0000 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-11-22 15:11:08 +0000 |
| commit | 56fce8e172065b93719d20e86330522906ba8a0e (patch) | |
| tree | f4ac1ce1cd64892c1e50b99ec9b561ce4c4e6b7d | |
| parent | afd526c004ee84a458f2d1552930f17c2f51c93c (diff) | |
| parent | 2bbaf923f9ee51afc199f4555db6edd43e3adba0 (diff) | |
| download | glibmm-56fce8e172065b93719d20e86330522906ba8a0e.tar.gz | |
Merge branch 'is_os_cocoa-meson' into 'master'
Meson build: fix is_os_cocoa detection
See merge request GNOME/glibmm!43
| -rw-r--r-- | meson.build | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/meson.build b/meson.build index 4d2c13a6..fd253a60 100644 --- a/meson.build +++ b/meson.build @@ -45,21 +45,7 @@ project_build_root = meson.current_build_dir() cpp_compiler = meson.get_compiler('cpp') is_msvc = cpp_compiler.get_id() == 'msvc' is_host_windows = host_machine.system() == 'windows' - -is_os_cocoa = false -if not is_host_windows - # This test for Mac OS is copied from glib. If the result of glib's test - # is ever made available outside glib, use glib's result instead of this test. - # glib: https://bugzilla.gnome.org/show_bug.cgi?id=780309 - # glibmm: https://bugzilla.gnome.org/show_bug.cgi?id=781947 - is_os_cocoa = cpp_compiler.compiles( - '''#include <Cocoa/Cocoa.h> - #ifdef GNUSTEP_BASE_VERSION - #error "Detected GNUstep, not Cocoa" - #endif''', - name: 'Mac OS X Cocoa support' - ) -endif +is_os_cocoa = host_machine.system() == 'darwin' python3 = import('python').find_installation() python_version = python3.language_version() |