diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 23:35:16 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 00:24:16 +0200 |
| commit | 77fe50b0f674253f390796f5d9bbf367c443f0da (patch) | |
| tree | 4610ebbadba65859954944e0c6d303c13234a58c /RepositoryExternal.mk | |
| parent | 936a1a9daf5d7feb4e1ebe0a2ab237f21c7bdc85 (diff) | |
cppunit: use libraries from WORKDIR
Change-Id: I5ce895e6cadc874a3464e6109dfbedd785dbac77
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 58020c4d6611..968d32687a1c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -199,14 +199,21 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ define gb_LinkTarget__use_cppunit $(call gb_LinkTarget_use_package,$(1),cppunit) -$(call gb_LinkTarget_use_libraries,$(1),\ - cppunit \ -) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,cppunit/include)\ $$(INCLUDE) \ ) +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,cppunit)/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.lib,ReleaseDll/cppunit_dll.lib) \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,cppunit)/src/cppunit/.libs -lcppunit \ +) +endif + endef endif |