diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-12-21 16:28:29 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-12-23 01:52:11 +0100 |
| commit | 5de0f4e7b52e5d1c12ac658d4aedc91b9ac342cd (patch) | |
| tree | 11a4c4f3072056ffcb4b89903ab025d8c315401f /svx | |
| parent | 7206de4f3d9eecdcbdd98294fa50f01c4c9ece9c (diff) | |
Don't lock galleries build into DESKTOP
And add the missing dependency of Executable_gengal on
Package_svx_gengal, so the actual executable script is
created in instdir_for_build for the cross-toolset.
Change-Id: I98ea1d58273c871f0a3b804a93970eedfb7f8908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108108
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Executable_gengal.mk | 4 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk index 9c82ac774ec5..1ec8841c1ab3 100644 --- a/svx/Executable_gengal.mk +++ b/svx/Executable_gengal.mk @@ -29,6 +29,10 @@ $(eval $(call gb_Executable_use_external,gengal,boost_headers)) $(eval $(call gb_Executable_use_sdk_api,gengal)) +ifneq (,$(filter-out MACOSX WNT,$(OS))) +$(eval $(call gb_Executable_use_package,gengal,svx_gengal)) +endif + $(eval $(call gb_Executable_use_libraries,gengal,\ basegfx \ sal \ diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 20339da7c58e..9a45df4943c1 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -51,7 +51,13 @@ $(eval $(call gb_Module_add_targets,svx,\ $(if $(filter-out MACOSX WNT,$(OS)), \ Package_gengal) \ )) +else # !DESKTOP +ifeq ($(WITH_GALLERY_BUILD),TRUE) +$(eval $(call gb_Module_add_targets_for_build,svx,\ + Executable_gengal \ +)) endif +endif # !DESKTOP $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ JunitTest_svx_unoapi \ |