diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-02 16:02:31 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-02 18:17:51 +0300 |
| commit | 3aa3d170a0f05a2f808f07446f869f38328466e5 (patch) | |
| tree | 69616fd0f6856db1bb465579e2e17fd3a94b0a7f | |
| parent | 60212d610762c262782eaf79bfd1fa3798d8afa7 (diff) | |
Bypass cppunit stuff for non-DESKTOP in more places
We don't run any cppunit tests for cross-compiled platforms anyway, so no
point in compiling that. (Especially as compiling cppunit currently fails in a
--enable-werror build at least for Android thanks to -Wundef.)
Change-Id: I3139c62305ccfeddc0f67729f10e224618d2fc03
| -rw-r--r-- | cppunit/Module_cppunit.mk | 4 | ||||
| -rw-r--r-- | test/Module_test.mk | 4 | ||||
| -rw-r--r-- | unotest/Module_unotest.mk | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/cppunit/Module_cppunit.mk b/cppunit/Module_cppunit.mk index 32a3fb831cc8..53ed611fe0c1 100644 --- a/cppunit/Module_cppunit.mk +++ b/cppunit/Module_cppunit.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Module_Module,cppunit)) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) + ifeq ($(SYSTEM_CPPUNIT),NO) $(eval $(call gb_Module_add_targets,cppunit,\ UnpackedTarball_cppunit \ @@ -17,4 +19,6 @@ $(eval $(call gb_Module_add_targets,cppunit,\ )) endif +endif + # vim: set noet sw=4 ts=4: diff --git a/test/Module_test.mk b/test/Module_test.mk index 6c8b81fa2992..9b352a5c003a 100644 --- a/test/Module_test.mk +++ b/test/Module_test.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Module_Module,test)) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,test,\ Library_test \ Library_subsequenttest \ @@ -34,4 +36,6 @@ $(eval $(call gb_Module_add_targets,test,\ Package_unittest \ )) +endif + # vim: set noet sw=4 ts=4: diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk index 6980b6e70a82..e9eee8f0e461 100644 --- a/unotest/Module_unotest.mk +++ b/unotest/Module_unotest.mk @@ -27,12 +27,14 @@ $(eval $(call gb_Module_Module,unotest)) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,unotest,\ Library_unobootstrapprotector \ Library_unoexceptionprotector \ Library_unotest \ Package_inc \ )) +endif ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,unotest,\ |