Skip to content

Commit f840656

Browse files
committed
meson: wip: headerchecks cpluspluschecks
1 parent 60cd583 commit f840656

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

src/include/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ config_paths_data.set_quoted('MANDIR', dir_prefix / dir_man)
4242

4343
var_cc = ' '.join(cc.cmd_array())
4444
var_cpp = ' '.join(cc.cmd_array() + ['-E'])
45-
var_cflags = ' '.join(cflags + cflags_warn + get_option('c_args'))
45+
var_cflags = ' '.join(cflags + cflags_warn + get_option('c_args') + ['-Wall'])
4646
if llvm.found()
47-
var_cxxflags = ' '.join(cxxflags + cxxflags_warn + get_option('cpp_args'))
47+
var_cxxflags = ' '.join(cxxflags + cxxflags_warn + get_option('cpp_args') + ['-Wall'])
4848
else
4949
var_cxxflags = ''
5050
endif

src/meson.build

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,10 @@ install_data(
4747
install_data(
4848
'makefiles/pgxs.mk',
4949
install_dir: dir_pgxs / 'src' / 'makefiles')
50+
51+
52+
run_target('headerscheck',
53+
command: [files('tools/pginclude/headerscheck'), '@SOURCE_ROOT@', '@BUILD_ROOT@'])
54+
55+
run_target('cpluspluscheck',
56+
command: [files('tools/pginclude/cpluspluscheck'), '@SOURCE_ROOT@', '@BUILD_ROOT@'])

src/tools/pginclude/cpluspluscheck

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ do
166166
# Some subdirectories need extra -I switches.
167167
case "$f" in
168168
src/pl/plperl/*)
169-
EXTRAINCLUDES="$perl_includespec" ;;
169+
EXTRAINCLUDES="$perl_includespec"; continue; ;;
170170
src/pl/plpython/*)
171-
EXTRAINCLUDES="$python_includespec" ;;
171+
EXTRAINCLUDES="$python_includespec"; continue; ;;
172172
src/interfaces/ecpg/*)
173173
EXTRAINCLUDES="-I $builddir/src/interfaces/ecpg/include -I $srcdir/src/interfaces/ecpg/include" ;;
174174
src/backend/parser/*)

src/tools/pginclude/headerscheck

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ do
149149
# Some subdirectories need extra -I switches.
150150
case "$f" in
151151
src/pl/plperl/*)
152-
EXTRAINCLUDES="$perl_includespec" ;;
152+
EXTRAINCLUDES="$perl_includespec"; continue; ;;
153153
src/pl/plpython/*)
154-
EXTRAINCLUDES="$python_includespec" ;;
154+
EXTRAINCLUDES="$python_includespec"; continue; ;;
155155
src/interfaces/ecpg/*)
156156
EXTRAINCLUDES="-I $builddir/src/interfaces/ecpg/include -I $srcdir/src/interfaces/ecpg/include" ;;
157157
src/backend/parser/*)

0 commit comments

Comments
 (0)