From 19c45de4cb41ac7519b601b29d58760a65de0adc Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Tue, 15 May 2018 15:39:01 +0100 Subject: [PATCH] Fix dependencies for CppunitTest_svl_qa_cppunit.mk Change-Id: I391ea52f5137975073a674ac1ad380277fe99846 Reviewed-on: https://gerrit.libreoffice.org/54381 Reviewed-by: Michael Stahl Reviewed-by: Rene Engelhard Tested-by: Rene Engelhard Tested-by: Jenkins --- RepositoryExternal.mk | 2 +- svl/CppunitTest_svl_qa_cppunit.mk | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ce29fb744cfe..92ab41cbdea1 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -829,7 +829,7 @@ else # !SYSTEM_LIBNUMBERTEXT ifneq ($(ENABLE_LIBNUMBERTEXT),) define gb_LinkTarget__use_libnumbertext - +$(call gb_LinkTarget_use_package,$(1),libnumbertext_numbertext) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libnumbertext/src) \ $$(INCLUDE) \ diff --git a/svl/CppunitTest_svl_qa_cppunit.mk b/svl/CppunitTest_svl_qa_cppunit.mk index 4f3cdcae7b63..0cee925f85df 100644 --- a/svl/CppunitTest_svl_qa_cppunit.mk +++ b/svl/CppunitTest_svl_qa_cppunit.mk @@ -27,14 +27,6 @@ $(eval $(call gb_CppunitTest_use_externals,svl_qa_cppunit, \ 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, \ -DENABLE_LIBNUMBERTEXT=$(if $(filter TRUE,$(ENABLE_LIBNUMBERTEXT)),1,0) \ ))