diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index bc1aa067d670..f7c857713cbe 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -273,8 +273,8 @@ $(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call gb_ endef -# Use standard configuration. -define gb_CppunitTest_use_configuration +# Use instdir configuration +define gb_CppunitTest_use_instdir_configuration $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,postprocess_registry) $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry) @@ -287,6 +287,13 @@ $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(WORKDIR)/unittest/registr endef +# Use standard configuration: instdir config + unittest config (in this order!) +define gb_CppunitTest_use_configuration +$(call gb_CppunitTest_use_instdir_configuration,$(1)) +$(call gb_CppunitTest_use_unittest_configuration,$(1)) + +endef + define gb_CppunitTest_use_executable $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2)) |