[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-5' - vcl/Executable_icontest.mk

[Louis Sautier]

 vcl/Executable_icontest.mk |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 5c1cedd91269295d0553f86dd23545530fe7e581
Author: Louis Sautier <sautier.louis at gmail.com>
Date:   Sun Jun 10 12:25:18 2018 +0200

    Fix build with GLM 0.9.9.0, tdf#118070
    
    One of the test files was forgotten in 953c4add8fd76d88f49a81ae4c21a1fdcc007e57
    
    Change-Id: I0315433c688ff7edb2ba599bbef203cac9de3022
    Reviewed-on: https://gerrit.libreoffice.org/55554
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>
    (cherry picked from commit 5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa)
    Reviewed-on: https://gerrit.libreoffice.org/55556
    (cherry picked from commit 4731827db269a11b8f12e22076a2f3c297298450)
    Reviewed-on: https://gerrit.libreoffice.org/55557
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 3a2505715f91cc871004aad064f11516d0027ed6)
    Reviewed-on: https://gerrit.libreoffice.org/55639
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index ce163303f8a4..8c917b71cd0e 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
 ))
 endif
 
+ifeq ($(SYSTEM_GLM),TRUE)
+$(eval $(call gb_Executable_add_defs,icontest,\
+    -DGLM_ENABLE_EXPERIMENTAL \
+))
+endif
+
 $(eval $(call gb_Executable_use_api,icontest,\
     offapi \
     udkapi \