[libsoup/wip/meson] Add APACHE_HTTPD as s project argument in main Meson build file
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/meson] Add APACHE_HTTPD as s project argument in main Meson build file
- Date: Mon, 4 Dec 2017 10:43:02 +0000 (UTC)
commit 039c36da9ee67461b864a4d62402249b4dcee42a
Author: Tomas Popela <tpopela redhat com>
Date: Mon Dec 4 11:39:10 2017 +0100
Add APACHE_HTTPD as s project argument in main Meson build file
Fixes the configure:
Meson encountered an error in file tests/meson.build, line 12, column 2:
Tried to use 'add_project_arguments' after a build target has been declared.
This is not permitted. Please declare all arguments before your targets.
meson.build | 1 +
tests/meson.build | 4 ----
2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index a3616da..ba6c9da 100644
--- a/meson.build
+++ b/meson.build
@@ -106,6 +106,7 @@ if have_apache
if apache_module_dir != '' and apache_ssl_module_dir != ''
have_apache = true
add_project_arguments('-DHAVE_APACHE=1', language : 'c')
+ add_project_arguments('-DAPACHE_HTTPD=' + cdata.get('APACHE_HTTPD'), language : 'c')
endif
cdata.set('APACHE_PHP_MODULE_DIR', apache_modules.stdout().split(':')[2])
endif
diff --git a/tests/meson.build b/tests/meson.build
index 91d42a9..3820d7a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -8,10 +8,6 @@ else
dependencies : [glib_dep, libsoup_dep])
endif
-if apache_httpd2.found()
- add_project_arguments('-DAPACHE_HTTPD=' + cdata.get('APACHE_HTTPD'), language : 'c')
-endif
-
# ['name', is_parallel]
tests = [
['auth', false],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]