Kaydet (Commit) b7e1bfef authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix CppunitTest_libreofficekit_tiledrendering dependencies

Remove the unnecessary ones, but make sure that e.g. the sofficeapp library is
built (which was not covered by depending on services.rdb).

Change-Id: I1adfa4aaaf60787c944d71cc289cdafba8351c1b
üst 5d970faf
...@@ -21,11 +21,7 @@ $(eval $(call gb_CppunitTest_use_external,libreofficekit_tiledrendering,boost_he ...@@ -21,11 +21,7 @@ $(eval $(call gb_CppunitTest_use_external,libreofficekit_tiledrendering,boost_he
# our test specifically tests LOK only functionality which would otherwise not # our test specifically tests LOK only functionality which would otherwise not
# require any normal LO api/libraries. # require any normal LO api/libraries.
$(eval $(call gb_CppunitTest_use_libraries,libreofficekit_tiledrendering, \ $(eval $(call gb_CppunitTest_use_libraries,libreofficekit_tiledrendering, \
cppu \
sal \ sal \
tl \
test \
vcl \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
...@@ -37,13 +33,6 @@ $(eval $(call gb_CppunitTest_add_libs,libreofficekit_tiledrendering,\ ...@@ -37,13 +33,6 @@ $(eval $(call gb_CppunitTest_add_libs,libreofficekit_tiledrendering,\
)) ))
endif endif
$(eval $(call gb_CppunitTest_use_sdk_api,libreofficekit_tiledrendering))
$(eval $(call gb_CppunitTest_use_ure,libreofficekit_tiledrendering))
# Depend on ~everything, as tiled rendering can use most parts of LO.
$(eval $(call gb_CppunitTest_use_rdb,libreofficekit_tiledrendering,services))
$(eval $(call gb_CppunitTest_use_configuration,libreofficekit_tiledrendering)) $(eval $(call gb_CppunitTest_use_configuration,libreofficekit_tiledrendering))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,libreofficekit)) ...@@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,libreofficekit))
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_slowcheck_targets,libreofficekit,\ $(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
CppunitTest_libreofficekit_tiledrendering \ CppunitTest_libreofficekit_tiledrendering \
)) ))
......
...@@ -16,11 +16,6 @@ ...@@ -16,11 +16,6 @@
#include <string> #include <string>
#include <stdio.h> #include <stdio.h>
#include <sal/types.h>
#include <tools/stream.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/pngwrite.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
#include <rtl/bootstrap.hxx> #include <rtl/bootstrap.hxx>
......
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