diff options
| author | Oleksii Samorukov <samm@os2.kiev.ua> | 2020-01-17 15:58:18 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2020-01-17 15:42:14 +0000 |
| commit | 0ac7b4b50c5499d092f5daf650769e9b4cc96138 (patch) | |
| tree | 744c0c433b3cef9299d52690138bd036456c8975 | |
| parent | ecee7d86a849a12eaedef43450c394379cc8b795 (diff) | |
| download | appstream-glib-0ac7b4b50c5499d092f5daf650769e9b4cc96138.tar.gz | |
Use internal uuid library in macOS
| -rw-r--r-- | libappstream-glib/as-utils.c | 4 | ||||
| -rw-r--r-- | libappstream-glib/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 5 |
3 files changed, 10 insertions, 1 deletions
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 <libsoup/soup.h> #include <stdlib.h> #ifndef _WIN32 +#ifdef __APPLE__ +#include <uuid/uuid.h> +#else #include <uuid.h> #endif +#endif #ifdef HAVE_RPM #include <rpm/rpmlib.h> 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') |