Let CppunitTest_odk_checkapi build against the SDK include directory

Desktop / LibreOffice - Stephan Bergmann [redhat.com] - 19 January 2022 22:00 UTC

...which contains only the URE include files, rather than against the SRCDIR one which contains many more. This would have prevented 148536afc9838398100ca2267b99ab349dcbb38c "Drop config_global.h from osl/module.h", where an URE include file had accidentally started to include a non-URE file.

(The way $(INCLUDE) is now set up in odk/CppunitTest_odk_checkapi.mk is a bit hacky, and this change required teaching compilerplugins about SDKDIR to avoid false warnings. Another approach would be to make the test compile in the SDK build environment, similarly to CustomTarget_odk/build-examples, but setting up the SDK build environment from within gbuild is not supported at least on Windows for now. A smaller improvement would be to drop the need to include any CppUnit include directories, by turning the test into some kind of compile-only test similar to a gb_CompilerTest.)

Change-Id: If79761909c67c3162d01f847dfb5d4f538f91ca1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128591

d923625d89fd Let CppunitTest_odk_checkapi build against the SDK include directory
compilerplugins/clang/plugin.cxx | 13 ++++++++++++-
compilerplugins/clang/plugin.hxx | 4 ++++
compilerplugins/clang/reservedid.cxx | 10 ++++------
config_host/config_clang.h.in | 1 +
configure.ac | 1 +
odk/CppunitTest_odk_checkapi.mk | 32 ++++++++++++++++++--------------
solenv/gbuild/LinkTarget.mk | 2 +-
7 files changed, 41 insertions(+), 22 deletions(-)

Upstream: cgit.freedesktop.org


  • Share