[Libreoffice-commits] core.git: chart2/Library_chartcore.mk vcl/Library_vcl.mk

[Rene Engelhard]

 chart2/Library_chartcore.mk |    6 ++++++
 vcl/Library_vcl.mk          |    6 ++++++
 2 files changed, 12 insertions(+)

New commits:
commit 953c4add8fd76d88f49a81ae4c21a1fdcc007e57
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Jan 28 19:48:25 2018 +0100

    fix build with glm 0.9.9
    
    In file included from /usr/include/glm/gtx/norm.hpp:18:0,
                     from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti
    ls.hxx:16,
                     from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende
    rUtils.hxx:14,
                     from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti
    ls.cxx:11:
    /usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion
     is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
     # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
       ^~~~~
    
    so just define it.
    
    Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f

diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 28bc87b89057..69d4c0552636 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\
     -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
 ))
 
+ifeq ($(SYSTEM_GLM),TRUE)
+$(eval $(call gb_Library_add_defs,chartcore,\
+        -DGLM_ENABLE_EXPERIMENTAL \
+))
+endif
+
 $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
 
 $(eval $(call gb_Library_use_externals,chartcore,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index c1f3cc5324e7..0b684c6185a9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
 	-DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
 ))
 
+ifeq ($(SYSTEM_GLM),TRUE)
+$(eval $(call gb_Library_add_defs,vcl,\
+        -DGLM_ENABLE_EXPERIMENTAL \
+))
+endif
+
 $(eval $(call gb_Library_use_sdk_api,vcl))
 
 $(eval $(call gb_Library_use_custom_headers,vcl,\