vcl/Executable_icontest.mk | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 3a2505715f91cc871004aad064f11516d0027ed6
Author: Louis Sautier <[email protected]>
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 <[email protected]>
Tested-by: Rene Engelhard <[email protected]>
(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 <[email protected]>
Reviewed-by: Caolán McNamara <[email protected]>
Tested-by: Caolán McNamara <[email protected]>
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 \
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
