diff options
| -rw-r--r-- | compilerplugins/clang/test/externvar.cxx | 2 | ||||
| -rw-r--r-- | compilerplugins/clang/test/unnecessaryoverride-dtor.cxx | 2 | ||||
| -rw-r--r-- | external/graphite/StaticLibrary_graphite.mk | 1 | ||||
| -rw-r--r-- | external/libcmis/StaticLibrary_libcmis.mk | 5 | ||||
| -rw-r--r-- | sal/textenc/generate/gb180302000.tab | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 1 |
6 files changed, 9 insertions, 4 deletions
diff --git a/compilerplugins/clang/test/externvar.cxx b/compilerplugins/clang/test/externvar.cxx index 51f743fbba83..c4b30d6625f0 100644 --- a/compilerplugins/clang/test/externvar.cxx +++ b/compilerplugins/clang/test/externvar.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <externvar.hxx> +#include "externvar.hxx" int v1; int v2; // expected-error {{variable with external linkage not declared in an include file [loplugin:externvar]}} expected-note {{should either have internal linkage or be declared in an include file [loplugin:externvar]}} diff --git a/compilerplugins/clang/test/unnecessaryoverride-dtor.cxx b/compilerplugins/clang/test/unnecessaryoverride-dtor.cxx index 518ec711d6d2..b54957be2d7a 100644 --- a/compilerplugins/clang/test/unnecessaryoverride-dtor.cxx +++ b/compilerplugins/clang/test/unnecessaryoverride-dtor.cxx @@ -11,7 +11,7 @@ #include <salhelper/simplereferenceobject.hxx> -#include <unnecessaryoverride-dtor.hxx> +#include "unnecessaryoverride-dtor.hxx" struct NonVirtualBase {}; diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk index b0ec4cc50682..8c16482ba11b 100644 --- a/external/graphite/StaticLibrary_graphite.mk +++ b/external/graphite/StaticLibrary_graphite.mk @@ -15,6 +15,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,graphite)) $(eval $(call gb_StaticLibrary_set_include,graphite,\ -I$(call gb_UnpackedTarball_get_dir,graphite/include) \ + -I$(call gb_UnpackedTarball_get_dir,graphite/src) \ $$(INCLUDE) \ )) diff --git a/external/libcmis/StaticLibrary_libcmis.mk b/external/libcmis/StaticLibrary_libcmis.mk index 705cc6c6451d..b7e662465479 100644 --- a/external/libcmis/StaticLibrary_libcmis.mk +++ b/external/libcmis/StaticLibrary_libcmis.mk @@ -23,6 +23,11 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,libcmis,\ )) endif +$(eval $(call gb_StaticLibrary_set_include,libcmis, \ + -I$(call gb_UnpackedTarball_get_dir,libcmis/src/libcmis) \ + $$(INCLUDE) \ +)) + $(eval $(call gb_StaticLibrary_use_unpacked,libcmis,libcmis)) $(eval $(call gb_StaticLibrary_use_externals,libcmis,\ diff --git a/sal/textenc/generate/gb180302000.tab b/sal/textenc/generate/gb180302000.tab index d932a4e7bd7c..00fc5134c727 100644 --- a/sal/textenc/generate/gb180302000.tab +++ b/sal/textenc/generate/gb180302000.tab @@ -20,7 +20,7 @@ #include <sal/types.h> -#include <convertgb18030.hxx> +#include "../convertgb18030.hxx" static sal_Unicode const aImplGb180302000ToUnicodeData[] = { 0x4E02,0x4E04,0x4E05,0x4E06,0x4E0F,0x4E12,0x4E17,0x4E1F, diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 09db3a19dae6..efdefca98913 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -60,7 +60,6 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ $(if $(COMPILER_TEST),,$(call gb_cxx_dep_generation_options,$(1),$(4))) \ - -I$(dir $(3)) \ $(INCLUDE) \ $(PCHFLAGS) \ $(if $(COMPILER_TEST),,$(call gb_cxx_dep_copy,$(4))) \ |