diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-08 15:12:18 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-08 15:12:18 +0200 |
| commit | fbbb833dda9e86d93e8f45f02a1286edb81033a3 (patch) | |
| tree | da6d2d88c5e6396ac2578a5ab9fd91be77862ae4 /solenv | |
| parent | cd2c512f9f6b6aa000fa48efb18033b3ebb3a264 (diff) | |
compile- and run-time use of UNO must be split
There are unit tests that do not use URE, e.g., in cppuhelper.
This reverts commit 33e9f3d3d6b29545ef9df3f5334c015e15caa5c8.
Conflicts:
sot/CppunitTest_sot_test_sot.mk
svl/CppunitTest_svl_urihelper.mk
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 32f498bb0918..28538358d15d 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -146,7 +146,9 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS += $(2) endef define gb_CppunitTest_uses_ure -$$(call gb_Output_error,gb_CppunitTest_uses_ure: use gb_CppunitTest_use_api instead.)) +$(call gb_CppunitTest_use_rdb,$(1),ure/services) +$(call gb_CppunitTest_get_target,$(1)) : URE := $(true) + endef define gb_CppunitTest_add_type_rdb @@ -178,8 +180,6 @@ endef define gb_CppunitTest_use_api $(call gb_LinkTarget_use_api,$(call gb_CppunitTest__get_linktargetname,$(1)),$(2)) $(foreach rdb,$(2),$(call gb_CppunitTest__use_api,$(1),$(rdb))) -$(call gb_CppunitTest_use_rdb,$(1),ure/services) -$(call gb_CppunitTest_get_target,$(1)) : URE := $(true) endef |