diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-07-09 16:33:00 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:21:49 +0100 |
| commit | 4c98932b128941fbeef4f5bb9c3e17eb3dda280f (patch) | |
| tree | fc2aec458824327f66b00bbc043fa327a5dcd342 /sd | |
| parent | 21b4fecc6107465b64b7e4c9cfedcd787b26fe3a (diff) | |
make tests link
Change-Id: I69d2baab2a6259e99188a86f916a6fa25d46ac74
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_filters_test.mk | 4 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 6 | ||||
| -rw-r--r-- | sd/Library_sd.mk | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 6afe52d4d79d..ad13e96dbaaf 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -67,6 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_libs,sd_filters_test,\ + $(shell pkg-config --libs glib-2.0 json-glib-1.0) \ +)) + $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 44fb871105ca..4e453153d85d 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -36,11 +36,15 @@ $(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\ -DSD_DLLIMPLEMENTATION \ )) -$(eval $(call gb_CppunitTest_use_api,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_sdk_api,sd_uimpress,\ offapi \ udkapi \ )) +$(eval $(call gb_CppunitTest_add_libs,sd_uimpress,\ + $(shell pkg-config --libs glib-2.0 json-glib-1.0) \ +)) + $(eval $(call gb_CppunitTest_use_library_objects,sd_uimpress,sd)) $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 0fadcbfd2132..9492c9a1530c 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_libs,sd,\ $(shell pkg-config --libs glib-2.0 json-glib-1.0) \ )) - $(eval $(call gb_Library_set_componentfile,sd,sd/util/sd)) $(eval $(call gb_Library_add_exception_objects,sd,\ |