diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | include/test/setupvcl.hxx | 2 | ||||
| -rw-r--r-- | include/test/testdllapi.hxx | 6 | ||||
| -rw-r--r-- | sdext/Executable_pdf2xml.mk | 1 | ||||
| -rw-r--r-- | test/Library_test-setupvcl.mk | 37 | ||||
| -rw-r--r-- | test/Library_test.mk | 2 | ||||
| -rw-r--r-- | test/Library_vclbootstrapprotector.mk | 2 | ||||
| -rw-r--r-- | test/Module_test.mk | 1 |
8 files changed, 48 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 03573fb27e32..23dc36533645 100644 --- a/Repository.mk +++ b/Repository.mk @@ -484,6 +484,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ smoketest \ subsequenttest \ test \ + test-setupvcl \ testtools_cppobj \ testtools_bridgetest \ testtools_constructors \ diff --git a/include/test/setupvcl.hxx b/include/test/setupvcl.hxx index b2b3afaf7b37..e7a1d08bba2c 100644 --- a/include/test/setupvcl.hxx +++ b/include/test/setupvcl.hxx @@ -17,7 +17,7 @@ namespace test { // Calls InitVCL etc.; needed from multiple places in the test infrastructure: -OOO_DLLPUBLIC_TEST void setUpVcl(); +OOO_DLLPUBLIC_TEST_SETUPVCL void setUpVcl(); } diff --git a/include/test/testdllapi.hxx b/include/test/testdllapi.hxx index 3e33b0b51ec0..c0a1eb02909b 100644 --- a/include/test/testdllapi.hxx +++ b/include/test/testdllapi.hxx @@ -28,6 +28,12 @@ #define OOO_DLLPUBLIC_TEST SAL_DLLPUBLIC_IMPORT #endif +#if defined OOO_DLLIMPLEMENTATION_TEST_SETUPVCL +#define OOO_DLLPUBLIC_TEST_SETUPVCL SAL_DLLPUBLIC_EXPORT +#else +#define OOO_DLLPUBLIC_TEST_SETUPVCL SAL_DLLPUBLIC_IMPORT +#endif + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk index 6dcb26f9fc2a..373f40da36fd 100644 --- a/sdext/Executable_pdf2xml.mk +++ b/sdext/Executable_pdf2xml.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\ comphelper \ cppu \ unotest \ - test \ cppuhelper \ sal \ )) diff --git a/test/Library_test-setupvcl.mk b/test/Library_test-setupvcl.mk new file mode 100644 index 000000000000..dd48ad813758 --- /dev/null +++ b/test/Library_test-setupvcl.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Library_Library,test-setupvcl)) + +$(eval $(call gb_Library_add_defs,test-setupvcl,\ + -DOOO_DLLIMPLEMENTATION_TEST_SETUPVCL \ +)) + +$(eval $(call gb_Library_add_exception_objects,test-setupvcl, \ + test/source/setupvcl \ +)) + +$(eval $(call gb_Library_use_externals,test-setupvcl, \ + boost_headers \ +)) + +$(eval $(call gb_Library_use_libraries,test-setupvcl, \ + comphelper \ + cppu \ + i18nlangtag \ + sal \ + tl \ + utl \ + vcl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_sdk_api,test-setupvcl)) + +# vim: set noet sw=4 ts=4: diff --git a/test/Library_test.mk b/test/Library_test.mk index c0f073b87975..c2fb00be1d98 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,test,\ i18nlangtag \ sal \ svt \ + test-setupvcl \ tl \ utl \ unotest \ @@ -48,7 +49,6 @@ $(eval $(call gb_Library_add_exception_objects,test,\ test/source/xmlwriter \ test/source/primitive2dxmldump \ test/source/screenshot_test \ - test/source/setupvcl \ )) # vim: set noet sw=4 ts=4: diff --git a/test/Library_vclbootstrapprotector.mk b/test/Library_vclbootstrapprotector.mk index d16145b4991d..eb19f860c0bd 100644 --- a/test/Library_vclbootstrapprotector.mk +++ b/test/Library_vclbootstrapprotector.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_use_libraries,vclbootstrapprotector, \ cppu \ i18nlangtag \ sal \ - test \ + test-setupvcl \ tl \ utl \ vcl \ diff --git a/test/Module_test.mk b/test/Module_test.mk index 7482d280e94e..5e9bb15dacb7 100644 --- a/test/Module_test.mk +++ b/test/Module_test.mk @@ -13,6 +13,7 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,test,\ Library_test \ + Library_test-setupvcl \ Library_subsequenttest \ Library_vclbootstrapprotector \ Package_unittest \ |