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 /chart2 | |
| 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 'chart2')
| -rw-r--r-- | chart2/CppunitTest_chart2_dump.mk | 3 | ||||
| -rw-r--r-- | chart2/CppunitTest_chart2_geometry.mk | 3 | ||||
| -rw-r--r-- | chart2/CppunitTest_chart2_pivot_chart_test.mk | 3 | ||||
| -rw-r--r-- | chart2/CppunitTest_chart2_trendcalculators.mk | 3 | ||||
| -rw-r--r-- | chart2/CppunitTest_chart2_xshape.mk | 3 | ||||
| -rw-r--r-- | chart2/export_setup.mk | 3 | ||||
| -rw-r--r-- | chart2/import_setup.mk | 3 |
7 files changed, 14 insertions, 7 deletions
diff --git a/chart2/CppunitTest_chart2_dump.mk b/chart2/CppunitTest_chart2_dump.mk index 4bf7d692c1c6..90c12ff039a8 100644 --- a/chart2/CppunitTest_chart2_dump.mk +++ b/chart2/CppunitTest_chart2_dump.mk @@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dump, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ xo \ sw \ )) diff --git a/chart2/CppunitTest_chart2_geometry.mk b/chart2/CppunitTest_chart2_geometry.mk index 457d7ffd3036..f2467594abc3 100644 --- a/chart2/CppunitTest_chart2_geometry.mk +++ b/chart2/CppunitTest_chart2_geometry.mk @@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_geometry, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/chart2/CppunitTest_chart2_pivot_chart_test.mk b/chart2/CppunitTest_chart2_pivot_chart_test.mk index af49c8a0b02f..4dc7dca420cb 100644 --- a/chart2/CppunitTest_chart2_pivot_chart_test.mk +++ b/chart2/CppunitTest_chart2_pivot_chart_test.mk @@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_pivot_chart_test, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ xo \ sw \ )) diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk index f8c14bfba120..2ef23fc9bf90 100644 --- a/chart2/CppunitTest_chart2_trendcalculators.mk +++ b/chart2/CppunitTest_chart2_trendcalculators.mk @@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_trendcalculators, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ xo \ sw \ )) diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk index 08d43565d107..7f4c65f415dc 100644 --- a/chart2/CppunitTest_chart2_xshape.mk +++ b/chart2/CppunitTest_chart2_xshape.mk @@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ xo \ sw \ )) diff --git a/chart2/export_setup.mk b/chart2/export_setup.mk index 59bd27ef3938..359973634dbd 100644 --- a/chart2/export_setup.mk +++ b/chart2/export_setup.mk @@ -55,7 +55,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export$(1), \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) diff --git a/chart2/import_setup.mk b/chart2/import_setup.mk index 16647f5f9a0c..fb83a0462b7e 100644 --- a/chart2/import_setup.mk +++ b/chart2/import_setup.mk @@ -55,7 +55,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import$(1), \ ucbhelper \ unotest \ utl \ - vbahelper \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ vcl \ xo \ )) |