[Libreoffice-commits] core.git: external/libetonyek

[David Tardon]

 external/libetonyek/ExternalProject_libetonyek.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4f0ee1e0514c29a11eb74fd8fa29f594032d1660
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 19 16:56:07 2015 +0200

    quick & dirty fix for build with bundled glm
    
    Change-Id: I4ffff140f24f4b96c930c3f651cf592966534ef7

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index 3de8605..31ec898 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			XML_CFLAGS="$(LIBXML_CFLAGS)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
+			$(call gb_Helper_optional,GLM,GLM_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,glm)") \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)