diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-10-02 09:49:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-10-02 11:44:26 +0200 |
| commit | 174435dcba3d807a9258baa1f61053ab68b1e711 (patch) | |
| tree | 2b66f8c0071a24b41a230cbf1c9acc149344311f /sc/CppunitTest_sc_dataprovider.mk | |
| parent | fee3669a3395133a9e47ff2f0a96159cb3eefb89 (diff) | |
Cater for --without-java in CppunitTest_sc_dataprovider
...which appears to still work if you just disable the components that are not
present because they require Java.
Found by <https://ci.libreoffice.org/job/lo_tb_random_config_linux/1514/>.
Change-Id: I1a7f27a9f44d2a82953e4230c974f19e98127550
Reviewed-on: https://gerrit.libreoffice.org/61226
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/CppunitTest_sc_dataprovider.mk')
| -rw-r--r-- | sc/CppunitTest_sc_dataprovider.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/CppunitTest_sc_dataprovider.mk b/sc/CppunitTest_sc_dataprovider.mk index 8c449084ee8d..a2092498629d 100644 --- a/sc/CppunitTest_sc_dataprovider.mk +++ b/sc/CppunitTest_sc_dataprovider.mk @@ -83,10 +83,10 @@ $(eval $(call gb_CppunitTest_use_components,sc_dataprovider,\ comphelper/util/comphelp \ configmgr/source/configmgr \ connectivity/source/cpool/dbpool2 \ - connectivity/source/drivers/hsqldb/hsqldb \ + $(if $(ENABLE_JAVA),connectivity/source/drivers/hsqldb/hsqldb) \ connectivity/source/drivers/dbase/dbase \ $(if $(ENABLE_FIREBIRD_SDBC),connectivity/source/drivers/firebird/firebird_sdbc) \ - connectivity/source/drivers/jdbc/jdbc \ + $(if $(ENABLE_JAVA),connectivity/source/drivers/jdbc/jdbc) \ connectivity/source/manager/sdbc2 \ dbaccess/source/filter/xml/dbaxml \ dbaccess/util/dba \ |