From 0ac7b4b50c5499d092f5daf650769e9b4cc96138 Mon Sep 17 00:00:00 2001 From: Oleksii Samorukov Date: Fri, 17 Jan 2020 15:58:18 +0100 Subject: Use internal uuid library in macOS --- libappstream-glib/as-utils.c | 4 ++++ libappstream-glib/meson.build | 2 ++ meson.build | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libappstream-glib/as-utils.c b/libappstream-glib/as-utils.c index 10da362..007a86b 100644 --- a/libappstream-glib/as-utils.c +++ b/libappstream-glib/as-utils.c @@ -24,8 +24,12 @@ #include #include #ifndef _WIN32 +#ifdef __APPLE__ +#include +#else #include #endif +#endif #ifdef HAVE_RPM #include diff --git a/libappstream-glib/meson.build b/libappstream-glib/meson.build index 271c6da..cef815d 100644 --- a/libappstream-glib/meson.build +++ b/libappstream-glib/meson.build @@ -13,6 +13,8 @@ deps = [ if platform_win32 deps += [giowindows] +elif platform_osx + deps += [giounix] else deps += [giounix, uuid] endif diff --git a/meson.build b/meson.build index 3178766..331dd7a 100644 --- a/meson.build +++ b/meson.build @@ -14,13 +14,14 @@ as_micro_version = varr[2] # Check the right platform. platform_win32 = false +platform_osx = false host_os = host_machine.system() platform_win32 = (host_os.startswith('mingw') or host_os.startswith('cygwin') or host_os.startswith('windows')) - +platform_osx = host_os.startswith('darwin') conf = configuration_data() conf.set('AS_MAJOR_VERSION_CONF', as_major_version) @@ -64,6 +65,8 @@ glib = dependency('glib-2.0', version : glib_ver) gmodule = dependency('gmodule-2.0', version : glib_ver) if platform_win32 giowindows = dependency('gio-windows-2.0', version : glib_ver) +elif platform_osx + giounix = dependency('gio-unix-2.0', version : glib_ver) else giounix = dependency('gio-unix-2.0', version : glib_ver) uuid = dependency('uuid') -- cgit v1.2.1