mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dependencies for CppunitTest_svl_qa_cppunit.mk

Browse Source 
Change-Id: I391ea52f5137975073a674ac1ad380277fe99846
Reviewed-on: https://gerrit.libreoffice.org/54381
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Mike Kaganski 2018-05-15 15:39:01 +01:00
parent 923cf26dd0
commit 19c45de4cb
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RepositoryExternal.mk
View File

@ -829,7 +829,7 @@ else # !SYSTEM_LIBNUMBERTEXT
ifneq ($(ENABLE_LIBNUMBERTEXT),) ifneq ($(ENABLE_LIBNUMBERTEXT),)
define gb_LinkTarget__use_libnumbertext define gb_LinkTarget__use_libnumbertext
$(call gb_LinkTarget_use_package,$(1),libnumbertext_numbertext)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,libnumbertext/src) \ -I$(call gb_UnpackedTarball_get_dir,libnumbertext/src) \
$$(INCLUDE) \ $$(INCLUDE) \

8
svl/CppunitTest_svl_qa_cppunit.mk
View File

@ -27,14 +27,6 @@ $(eval $(call gb_CppunitTest_use_externals,svl_qa_cppunit, \
icu_headers \ icu_headers \
)) ))
ifeq ($(ENABLE_LIBNUMBERTEXT),TRUE)
ifneq ($(SYSTEM_LIBNUMBERTEXT),YES)
$(eval $(call gb_CppunitTest_use_package,svl_qa_cppunit, \
libnumbertext_numbertext \
))
endif
endif
$(eval $(call gb_CppunitTest_add_defs,svl_qa_cppunit, \ $(eval $(call gb_CppunitTest_add_defs,svl_qa_cppunit, \
-DENABLE_LIBNUMBERTEXT=$(if $(filter TRUE,$(ENABLE_LIBNUMBERTEXT)),1,0) \ -DENABLE_LIBNUMBERTEXT=$(if $(filter TRUE,$(ENABLE_LIBNUMBERTEXT)),1,0) \
)) ))