Update glm to 1.0.1 (#263)

nmwsharp · Mar 28, 2024 · 50bd765 · 50bd765
1 parent 8a151ce
commit 50bd765
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -18,6 +18,7 @@ endif()
 ## glm
 if(NOT TARGET glm::glm)
   add_subdirectory(glm)
+  target_compile_definitions(glm INTERFACE GLM_ENABLE_EXPERIMENTAL)
 endif()
 
 ## Imgui

diff --git a/deps/glm b/deps/glm
diff --git a/examples/demo-app/demo_app.cpp b/examples/demo-app/demo_app.cpp
@@ -29,7 +29,6 @@
 #include "simple_dot_mesh_parser.h"
 #include "surface_mesh_io.h"
 
-#define GLM_ENABLE_EXPERIMENTAL
 #include "glm/gtx/string_cast.hpp"
 
 #include "stb_image.h"

diff --git a/include/polyscope/view.h b/include/polyscope/view.h
@@ -19,10 +19,8 @@
 #include "glm/mat4x4.hpp"
 #include "glm/vec3.hpp"
 #include "glm/vec4.hpp"
-#define GLM_ENABLE_EXPERIMENTAL
 #include "glm/gtx/dual_quaternion.hpp"
 #include "glm/gtx/norm.hpp" // necessary for dual_quaternion below
-#undef GLM_ENABLE_EXPERIMENTAL
 
 namespace polyscope {
 namespace view {