glm fixes

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

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -19,6 +19,7 @@ endif()
 if(NOT TARGET glm::glm)
   add_subdirectory(glm)
   target_compile_definitions(glm INTERFACE GLM_ENABLE_EXPERIMENTAL)
+  set_target_properties(glm PROPERTIES LINKER_LANGUAGE CXX)
 endif()
 
 ## Imgui

diff --git a/include/polyscope/context.h b/include/polyscope/context.h
@@ -6,10 +6,8 @@
 #include <polyscope/weak_handle.h>
 
 #include <glm/glm.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
 
 #include <array>
 #include <map>