diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-06 16:45:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-06 21:04:40 +0100 |
| commit | 2f86601db1ff8f198666a07f4b25d113760c879c (patch) | |
| tree | 0141721769ff305fc3c3b468b4092ec61d868682 /RepositoryExternal.mk | |
| parent | f58074edfc7aa5b22475cd4b2aa2dd0729131fcf (diff) | |
always define GLM_FORCE_CTOR_INIT when using glm
Change-Id: I2a4ed756c6d18937d2c720243652df7a2d629959
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88121
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 405ad054510e..1f36dda8f202 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -90,12 +90,21 @@ endif # SYSTEM_MDDS ifneq ($(SYSTEM_GLM),) -gb_LinkTarget__use_glm_headers := +define gb_LinkTarget__use_glm_headers +$(call gb_LinkTarget_add_defs,$(1),\ + -DGLM_FORCE_CTOR_INIT \ +) + +endef + gb_ExternalProject__use_glm_headers := else define gb_LinkTarget__use_glm_headers +$(call gb_LinkTarget_add_defs,$(1),\ + -DGLM_FORCE_CTOR_INIT \ +) $(call gb_LinkTarget_use_unpacked,$(1),glm) $(call gb_LinkTarget_set_include,$(1),\ $(GLM_CFLAGS) \ |