Kaydet (Commit) 82f3b262 authored tarafından Michael Stahl's avatar Michael Stahl

xmloff: fix --enable-mergelibs build

... by merging all object-using CppunitTests into uxmloff, which is
already disabled for MERGELIBS.

Change-Id: I12ad08660fd714cceba2fe9b855cdb1bbda19c2d
üst d6b27080
# -*- 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_CppunitTest_CppunitTest,xmloff_tokenmap))
$(eval $(call gb_CppunitTest_add_exception_objects,xmloff_tokenmap, \
xmloff/qa/unit/tokenmap-test \
))
$(eval $(call gb_CppunitTest_use_custom_headers,xmloff_tokenmap, \
xmloff/generated \
))
$(eval $(call gb_CppunitTest_use_library_objects,xmloff_tokenmap,xo))
$(eval $(call gb_CppunitTest_use_api,xmloff_tokenmap, \
offapi \
udkapi \
))
$(eval $(call gb_CppunitTest_use_libraries,xmloff_tokenmap, \
basegfx \
comphelper \
cppu \
cppuhelper \
i18nlangtag \
sal \
salhelper \
sax \
svl \
tl \
utl \
vcl \
$(gb_UWINAPI) \
))
# vim: set noet sw=4 ts=4:
......@@ -11,9 +11,9 @@ $(eval $(call gb_CppunitTest_CppunitTest,xmloff_uxmloff))
$(eval $(call gb_CppunitTest_add_exception_objects,xmloff_uxmloff, \
xmloff/qa/unit/uxmloff \
xmloff/qa/unit/tokenmap-test \
))
$(eval $(call gb_CppunitTest_set_include,xmloff_uxmloff,\
-I$(SRCDIR)/xmloff/inc \
-I$(SRCDIR)/xmloff/source/style \
......@@ -21,6 +21,10 @@ $(eval $(call gb_CppunitTest_set_include,xmloff_uxmloff,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_custom_headers,xmloff_uxmloff, \
xmloff/generated \
))
$(eval $(call gb_CppunitTest_use_sdk_api,xmloff_uxmloff))
$(eval $(call gb_CppunitTest_use_ure,xmloff_uxmloff))
......
......@@ -29,7 +29,6 @@ $(eval $(call gb_Module_add_targets,xmloff,\
$(eval $(call gb_Module_add_check_targets,xmloff,\
$(if $(MERGELIBS),, \
CppunitTest_xmloff_uxmloff) \
CppunitTest_xmloff_tokenmap \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
......
......@@ -89,4 +89,3 @@ CPPUNIT_TEST_SUITE_REGISTRATION(TokenmapTest);
}
CPPUNIT_PLUGIN_IMPLEMENT();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment