From 562ff022321a2a55d6428a7dd70a1cad42775ddd Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Thu, 23 May 2024 19:56:14 +0100 Subject: [PATCH] Update glm to 1.0.1 (#819) * Update glm to 1.0.1 * Define GLM_ENABLE_EXPERIMENTAL for glm/gtx/quaternion.hpp With GLM 1: In file included from manifold/manifold/src/manifold/src/smoothing.cpp:15: manifold/manifold/build/_deps/glm-src/glm/gtx/quaternion.hpp:24:3: 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." --- manifoldDeps.cmake | 2 +- src/manifold/src/smoothing.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifoldDeps.cmake b/manifoldDeps.cmake index d36e8725a..0d902cb75 100644 --- a/manifoldDeps.cmake +++ b/manifoldDeps.cmake @@ -47,7 +47,7 @@ if(NOT glm_FOUND) set(GLM_BUILD_INSTALL "ON" CACHE STRING "") FetchContent_Declare(glm GIT_REPOSITORY https://github.com/g-truc/glm.git - GIT_TAG b06b775c1c80af51a1183c0e167f9de3b2351a79 + GIT_TAG 1.0.1 GIT_PROGRESS TRUE ) FetchContent_MakeAvailable(glm) diff --git a/src/manifold/src/smoothing.cpp b/src/manifold/src/smoothing.cpp index 294f2cdf5..fba330f74 100644 --- a/src/manifold/src/smoothing.cpp +++ b/src/manifold/src/smoothing.cpp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#define GLM_ENABLE_EXPERIMENTAL #include #include "impl.h"