From 340603a8284a8caed410ac2a2acae0687569ea72 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Fri, 17 Jan 2020 02:48:41 +0100
Subject: [PATCH] centos-7: centos glm is broken, replace with custom
broken meaning it doesn't install cmake configuration files, so
find_package(glm) does not work
---
centos-7/Dockerfile | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/centos-7/Dockerfile b/centos-7/Dockerfile
index b5049dd..d49a931 100644
--- a/centos-7/Dockerfile
+++ b/centos-7/Dockerfile
@@ -309,6 +309,19 @@ RUN version=4.14.2 && \
cd .. && \
rm -rf CGAL-${version}*
+# glm
+RUN version=0.9.9.5 && \
+ cd /tmp && \
+ curl -sSLO https://github.com/g-truc/glm/releases/download/${version}/glm-${version}.zip && \
+ unzip glm-${version}.zip && \
+ cd glm && \
+ cmake -S. -B build -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
+ && \
+ ninja -C build install && \
+ cd .. && \
+ rm -rf glm*
+
# SSL access to custom pypiserver
ADD agki-nas01.imp.fu-berlin.de-ca-cert.crt /etc/pki/ca-trust/source/anchors/agki-nas01.imp.fu-berlin.de-ca-cert.crt
RUN update-ca-trust
@@ -322,6 +335,6 @@ RUN yum install -y \
# Additional development dependencies
RUN yum install -y \
libepoxy-devel \
- glm-devel \
&& \
yum clean all
+
--
GitLab