[gjs] meson.build: Fix introspection builds on MSVC



commit feda06585352193a455c50d4b539e2e6ed9c8723
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Oct 25 16:46:52 2019 +0800

    meson.build: Fix introspection builds on MSVC
    
    Instead of defining G_LOG_DOMAIN globally, define it only when building
    libgjs and gjs-console, as the quotes in there can cause grief and we
    don't really need it for the introspection dumper program.

 meson.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index c8c7a082..ea9d7b2a 100644
--- a/meson.build
+++ b/meson.build
@@ -10,8 +10,6 @@ pkg = import('pkgconfig')
 
 top_include = include_directories('.')
 
-add_project_arguments('-DG_LOG_DOMAIN="Gjs"', language: ['c', 'cpp'])
-
 ### Check for conflicting build options ########################################
 
 if get_option('systemtap') and not get_option('dtrace')
@@ -458,6 +456,9 @@ endif
 
 libgjs_cpp_args = ['-DGJS_COMPILATION']
 
+# Check G-I and/or Meson on this one.
+libgjs_cpp_args += ['-DG_LOG_DOMAIN="Gjs"']
+
 if host_machine.system() == 'windows'
     # We need these defines to build properly for all Windows builds
     libgjs_cpp_args += ['-DWIN32', '-DXP_WIN']


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]