test/Library_subsequenttest.mk | 5 +++++ test/Library_test.mk | 5 +++++ test/inc/unoapi_property_testers.hxx | 6 +++--- test/source/sheet/spreadsheet.cxx | 2 +- test/source/unoapi_property_testers.cxx | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-)
New commits: commit fc3f43b6fe3df5e46ca869d5934d4c3333444881 Author: Jens Carl <[email protected]> Date: Wed Mar 21 05:12:54 2018 +0000 Move UNO API property testers header file Move the header file form the global include path include/test to the module-specific path test/inc. Change-Id: I72c1f3b420bc387f4f5b9ab75f30f0e8462c1b75 Reviewed-on: https://gerrit.libreoffice.org/51682 Tested-by: Jenkins <[email protected]> Reviewed-by: Jens Carl <[email protected]> diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 1e8fdb134770..ce88ef80a817 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -9,6 +9,11 @@ $(eval $(call gb_Library_Library,subsequenttest)) +$(eval $(call gb_Library_set_include,subsequenttest,\ + -I$(SRCDIR)/test/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_add_defs,subsequenttest,\ -DOOO_DLLIMPLEMENTATION_TEST \ )) diff --git a/test/Library_test.mk b/test/Library_test.mk index 47d0ffbec381..553eb2a3f148 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -9,6 +9,11 @@ $(eval $(call gb_Library_Library,test)) +$(eval $(call gb_Library_set_include,test,\ + -I$(SRCDIR)/test/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_add_defs,test,\ -DOOO_DLLIMPLEMENTATION_TEST \ )) diff --git a/include/test/unoapi_property_testers.hxx b/test/inc/unoapi_property_testers.hxx similarity index 93% rename from include/test/unoapi_property_testers.hxx rename to test/inc/unoapi_property_testers.hxx index 369ab586d366..1449df16b719 100644 --- a/include/test/unoapi_property_testers.hxx +++ b/test/inc/unoapi_property_testers.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_TEST_SHEET_UNOAPIPROPERTYHELPER_HXX -#define INCLUDED_TEST_SHEET_UNOAPIPROPERTYHELPER_HXX +#ifndef INCLUDED_TEST_INC_UNOAPIPROPERTYTESTERS_HXX +#define INCLUDED_TEST_INC_UNOAPIPROPERTYTESTERS_HXX #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/Reference.hxx> @@ -56,6 +56,6 @@ void OOO_DLLPUBLIC_TEST testStringProperty(css::uno::Reference<css::beans::XPropertySet>& xPropertySet, const OUString& name, const OUString& rValue); } -#endif // INCLUDED_TEST_SHEET_UNOAPIPROPERTYHELPER_HXX +#endif // INCLUDED_TEST_INC_UNOAPIPROPERTYTESTERS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/test/source/sheet/spreadsheet.cxx b/test/source/sheet/spreadsheet.cxx index 6ff83c475e46..f63c3667deee 100644 --- a/test/source/sheet/spreadsheet.cxx +++ b/test/source/sheet/spreadsheet.cxx @@ -8,7 +8,7 @@ */ #include <test/sheet/spreadsheet.hxx> -#include <test/unoapi_property_testers.hxx> +#include <unoapi_property_testers.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/test/source/unoapi_property_testers.cxx b/test/source/unoapi_property_testers.cxx index 08fde5ebd5d0..756321a7e317 100644 --- a/test/source/unoapi_property_testers.cxx +++ b/test/source/unoapi_property_testers.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapi_property_testers.hxx> +#include <unoapi_property_testers.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/Any.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
