diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-21 14:09:03 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-21 14:19:50 +0200 |
| commit | 136f53f58e89b13e4d89571fef25b8ba6679e6b4 (patch) | |
| tree | 041ae83ed5d2ef45ccd09c5fb09947073c794993 /solenv | |
| parent | More --disable-database-connectivity work, still experimental (diff) | |
| download | core-136f53f58e89b13e4d89571fef25b8ba6679e6b4.tar.gz core-136f53f58e89b13e4d89571fef25b8ba6679e6b4.zip | |
More clever way to filter out component files for libs not built
I.e. BASIC stuff for iOS and database connectivity stuff when using
--disable-database-connectivity. All of this quite experimental so
far, using the latter will break your build.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index e4065bd04189..acaf76bef49c 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -178,8 +178,21 @@ $(call gb_CppunitTest_get_target,$(1)) : \ endef +# Given a list of component files, filter out those corresponding +# to libraries not built in this configuration. +define gb_CppunitTest__filter_not_built_components +$(filter-out \ + $(if $(filter $(OS),IOS), \ + basic/util/sb \ + sw/util/vbaswobj \ + scripting/source/basprov/basprov \ + scripting/util/scriptframe) \ + $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),, \ + dbaccess/util/dba),$(1)) +endef + define gb_CppunitTest_add_components -$(foreach component,$(2),$(call gb_CppunitTest_add_component,$(1),$(component))) +$(foreach component,$(call gb_CppunitTest__filter_not_built_components,$(2)),$(call gb_CppunitTest_add_component,$(1),$(component))) endef |