Unbreak compilation with CEF.

diff --git a/meson.build b/meson.build
index 7146fb82ee03e95ea52d234d67831d13e762352b..296615e1ec7632879505ddebdfe45a2080088a81 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -28,6 +28,11 @@ if cxx.has_argument('-Wno-deprecated-declarations')
        add_project_arguments('-Wno-deprecated-declarations', language: 'cpp')
 endif
 
+# This needs to be done before declaring any build targets.
+if get_option('cef_dir') != ''
+       add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
+endif
+
 top_include = include_directories('.')
 
 subdir('shared')

diff --git a/nageru/meson.build b/nageru/meson.build
index 3c74a79c890820086bfd9de5ac9a6cb8c425fc7f..ea2d24eeb185574e5c5bd07a75fb8cc622936b48 100644 (file)
--- a/nageru/meson.build
+++ b/nageru/meson.build
@@ -46,7 +46,8 @@ cef_dir = get_option('cef_dir')
 cef_build_type = get_option('cef_build_type')
 have_cef = (cef_dir != '')
 if have_cef
-       add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
+       # This is done in the top-level file; just kept here for reference.
+       # add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
 
        system_cef = (cef_build_type == 'system')
        if system_cef