diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-04-13 21:27:27 +0200 |
|---|---|---|
| committer | Tomas Popela <tpopela@redhat.com> | 2018-04-17 10:24:02 +0200 |
| commit | b03ff4e20bd656bc87194db26157b9a9b6c138d3 (patch) | |
| tree | 3097aabc40dd207e2fb2636319cd1e7340137970 | |
| parent | bc489c3d3ca7bc1797ffed7f043ec13c56c1639c (diff) | |
| download | libsoup-b03ff4e20bd656bc87194db26157b9a9b6c138d3.tar.gz | |
meson: Move HAVE_CONFIG_H define to global args
Resolves missing config in examples and tests.
https://bugzilla.gnome.org/show_bug.cgi?id=782410
| -rw-r--r-- | libsoup/meson.build | 1 | ||||
| -rw-r--r-- | meson.build | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libsoup/meson.build b/libsoup/meson.build index 4ead22f5..e83bf39b 100644 --- a/libsoup/meson.build +++ b/libsoup/meson.build @@ -176,7 +176,6 @@ soupenum_h = soup_enums[1] soupenum_c = soup_enums[0] libsoup_c_args = [ - '-DHAVE_CONFIG_H', '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()), '-DLIBSOUP_COMPILATION' ] diff --git a/meson.build b/meson.build index 057198ed..5a26179a 100644 --- a/meson.build +++ b/meson.build @@ -20,9 +20,13 @@ libsoup_api_name = '@0@-@1@'.format(meson.project_name(), apiversion) host_system = host_machine.system() +common_flags = [ + '-DHAVE_CONFIG_H', +] + # Enable extra warnings if compiler supports them. if cc.get_id() == 'msvc' - common_flags = ['/FImsvc_recommended_pragmas.h'] + common_flags += ['/FImsvc_recommended_pragmas.h'] else test_cflags = [ '-Wall', @@ -38,7 +42,7 @@ else '-Wno-format-zero-length', ] - common_flags = cc.get_supported_arguments(test_cflags) + common_flags += cc.get_supported_arguments(test_cflags) endif add_project_arguments(common_flags, language : 'c') |