Skip to content

Commit

Permalink
fix build with glm 0.9.9
Browse files Browse the repository at this point in the history
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
  • Loading branch information
reneengelhard committed Jan 28, 2018
1 parent faa499c commit 953c4ad
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions chart2/Library_chartcore.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
6 changes: 6 additions & 0 deletions vcl/Library_vcl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down

0 comments on commit 953c4ad

Please sign in to comment.