diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-06 16:59:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-06 21:16:43 +0200 |
| commit | 26cfb57abfc037752bc02dae043f08ac7b2bc711 (patch) | |
| tree | 048c0d651799eaa77908a3ac4c3dd7a1a24c24d6 /sw | |
| parent | 245d73fa13bcb2b453308c304b215b9de4ae2602 (diff) | |
use Helper_optional SCRIPTING for libs that don't exist if --disable-scripting
Change-Id: Iec65d6395b903e13f788fe8322b60aac5b974cd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120125
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_apitests.mk | 3 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_macros_test.mk | 3 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_uwriter.mk | 3 | ||||
| -rw-r--r-- | sw/Library_vbaswobj.mk | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sw/CppunitTest_sw_apitests.mk b/sw/CppunitTest_sw_apitests.mk index d65c058fc97c..9af8873079d3 100644 --- a/sw/CppunitTest_sw_apitests.mk +++ b/sw/CppunitTest_sw_apitests.mk @@ -53,7 +53,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_apitests, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 7f38c45180bb..805242613b58 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -48,7 +48,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index e6a490c5dff1..ef9951ca1f80 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -56,7 +56,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xmlreader \ xo \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index a73b5d1721f1..8867fcf5ede4 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -56,7 +56,8 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ tk \ tl \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ )) |