Skip to content

Commit be5bbed

Browse files
committed
meson: wip: headerchecks cpluspluschecks
1 parent b359c89 commit be5bbed

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

src/include/meson.build

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

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

src/include/utils/pg_locale.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include <xlocale.h>
1717
#endif
1818
#ifdef USE_ICU
19+
/* the cplusplus portion doesn't parse inside extern "C" { } */
20+
#define U_SHOW_CPLUSPLUS_API 0
1921
#include <unicode/ucol.h>
2022
#endif
2123

src/meson.build

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,20 @@ install_data(
5151
install_data(
5252
'makefiles/pgxs.mk',
5353
install_dir: dir_pgxs / 'src' / 'makefiles')
54+
55+
56+
generated_sources_stamp = custom_target('generated-sources-stamp.h',
57+
output: 'generated-sources-stamp.h',
58+
input: [generated_sources, generated_headers_stamp, generated_backend_headers_stamp],
59+
command: stamp_cmd,
60+
)
61+
62+
run_target('headerscheck',
63+
command: [files('tools/pginclude/headerscheck'), '@SOURCE_ROOT@', '@BUILD_ROOT@'],
64+
depends: [generated_sources_stamp, generated_headers_stamp, generated_backend_headers_stamp],
65+
)
66+
67+
run_target('cpluspluscheck',
68+
command: [files('tools/pginclude/cpluspluscheck'), '@SOURCE_ROOT@', '@BUILD_ROOT@'],
69+
depends: [generated_sources_stamp, generated_headers_stamp, generated_backend_headers_stamp],
70+
)

src/tools/pginclude/cpluspluscheck

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ do
198198
src/pl/plperl/*)
199199
EXTRAINCLUDES="$perl_includespec" ;;
200200
src/pl/plpython/*)
201-
EXTRAINCLUDES="$python_includespec" ;;
201+
EXTRAINCLUDES="$python_includespec"; ;;
202202
src/interfaces/ecpg/*)
203203
EXTRAINCLUDES="-I $builddir/src/interfaces/ecpg/include -I $srcdir/src/interfaces/ecpg/include" ;;
204204
src/backend/parser/*)

0 commit comments

Comments
 (0)