From 1901cc1169660c50fc651c68861bdb022d931da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 22 Sep 2021 12:13:13 +0100 Subject: [PATCH] don't link to vbahelper for --disable-scripting case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I50dca4c11234677d2c6987d360b1317890b5484b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122427 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 3 ++- dbaccess/CppunitTest_dbaccess_dialog_save.mk | 3 ++- dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk | 3 ++- dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk | 3 ++- dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk | 3 ++- dbaccess/CppunitTest_dbaccess_macros_test.mk | 3 ++- dbaccess/CppunitTest_dbaccess_nolib_save.mk | 3 ++- dbaccess/CppunitTest_dbaccess_tdf119625.mk | 3 ++- dbaccess/CppunitTest_dbaccess_tdf126268.mk | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk index ac11256d6bfd..1b67411fb4bd 100644 --- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk +++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk @@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk index 408366ecb445..81adbc733a20 100644 --- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk +++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk @@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk index 6d1e47df4a30..3a4b44479635 100644 --- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk @@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_empty_stdlib_save, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk b/dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk index ee10da23df90..23ec9e1e4e1e 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk @@ -48,7 +48,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_hsql_binary_import, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk b/dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk index 8c8d06698b38..7e131c81052f 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk @@ -46,7 +46,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_hsql_schema_import, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 8d8672e882fe..248a5520c66c 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk b/dbaccess/CppunitTest_dbaccess_nolib_save.mk index 1490c024aeb2..088dc92c4310 100644 --- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk @@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_nolib_save, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_tdf119625.mk b/dbaccess/CppunitTest_dbaccess_tdf119625.mk index b58aa973df52..b96ea797f27f 100644 --- a/dbaccess/CppunitTest_dbaccess_tdf119625.mk +++ b/dbaccess/CppunitTest_dbaccess_tdf119625.mk @@ -48,7 +48,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_tdf119625, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_tdf126268.mk b/dbaccess/CppunitTest_dbaccess_tdf126268.mk index bdcec51f2f46..b3e97206b12b 100644 --- a/dbaccess/CppunitTest_dbaccess_tdf126268.mk +++ b/dbaccess/CppunitTest_dbaccess_tdf126268.mk @@ -48,7 +48,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_tdf126268, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ ))