From d82236748bd88b6dee9dd82653fbf0f766bb6cae Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Tue, 4 Dec 2018 00:31:44 +0100 Subject: [PATCH] Unbreak compilation with CEF. --- meson.build | 5 +++++ nageru/meson.build | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 7146fb8..296615e 100644 --- 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 3c74a79..ea2d24e 100644 --- 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 -- 2.39.2