From 697e63b8cc55f1e19ab1b5433167bbb0912f1c8c Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Mon, 9 Dec 2019 15:57:03 +0000
Subject: [PATCH] added incdirs to absolute_incdirs
---
meson.build | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index e05744b53..72640a178 100644
--- a/meson.build
+++ b/meson.build
@@ -508,17 +508,18 @@ _include_search_paths = [
'/usr/local/include',
]
foreach idir : _include_search_paths
- message('search ' + idir)
+ #message('search ' + idir)
_ret = run_command('meson/directory_exists.sh',idir).returncode()
- message('ret = ' + _ret.to_string())
+ #message('ret = ' + _ret.to_string())
if _ret == 0
inc_arg = idir
+ absolute_incdirs += idir
_Inc_arg = '-I' + idir
if not found and compiler.has_header('gsl/gsl_blas.h',
args: _Inc_arg)
my_incdirs += [inc_arg]
found = true
- message('found')
+ #message('found')
endif
endif
endforeach
@@ -526,7 +527,7 @@ endforeach
incdirs += [ my_incdirs ]
_i = ' '.join(my_incdirs)
-message('Incdirs are ' + _i)
+#message('Incdirs are ' + _i)
############################################################
# features which are converted into preprocessor flags (-D)
@@ -651,7 +652,7 @@ cflags_quoted = ''.join(cflags_quoted.split('"')) # remove "
cflags_quoted = '-DCFLAGS=' + ''.join(['"', cflags_quoted , '"']) # surround in " ... "
cc_quoted = '-DCC="' + compiler.get_id() + '"'
ld_quoted = '-DLD="' + compiler.get_id() + '"'
-incdirs_quoted = '-DINCDIRS=' + ''.join(['"-I', ' -I'.join(absolute_incdirs),'"']) # make -I... -I...
+incdirs_quoted = '-DINCDIRS=' + ''.join(['"-I',' -I'.join(absolute_incdirs),'"']) # make -I... -I...
message('INCDIRS=' + incdirs_quoted)
incdirs_quoted = '_slash_'.join(incdirs_quoted.split('/')) # deslash (convert / to _slash_)
libdirs_quoted = '-DLIBDIRS=' + ''.join(['"-L', ' -L'.join(libdirs),'"']) # make -L... -L...
--
GitLab