From 77524691f834d2fb11c8057be1d3f7d19acc3111 Mon Sep 17 00:00:00 2001
From: Jarrett Johnson <jarrett.johnson@schrodinger.com>
Date: Tue, 13 Aug 2024 14:55:36 -0400
Subject: [PATCH] Include minimal glm headers instead of glm.hpp

---
 layer0/Bezier.h            | 2 +-
 layer0/TTT.h               | 3 ++-
 layer1/Camera.cpp          | 3 ++-
 layer1/Ray.h               | 3 ++-
 layer1/Scene.cpp           | 3 ++-
 layer1/SceneMouse.cpp      | 4 +++-
 layer1/SceneView.h         | 3 ++-
 layer2/ObjectCurve.h       | 2 +-
 layer3/Executive.cpp       | 2 +-
 layer3/Interactions.cpp    | 2 +-
 layerCTest/Test_Bezier.cpp | 2 ++
 11 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/layer0/Bezier.h b/layer0/Bezier.h
index 60e476cb5..a852bc7a5 100644
--- a/layer0/Bezier.h
+++ b/layer0/Bezier.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
 
 namespace pymol
 {
diff --git a/layer0/TTT.h b/layer0/TTT.h
index 6a3e51a93..2e3288a6d 100644
--- a/layer0/TTT.h
+++ b/layer0/TTT.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
+#include <glm/mat4x4.hpp>
 #include <glm/gtc/quaternion.hpp>
 
 struct CViewElem;
diff --git a/layer1/Camera.cpp b/layer1/Camera.cpp
index 913acc105..ab25b6fea 100644
--- a/layer1/Camera.cpp
+++ b/layer1/Camera.cpp
@@ -1,6 +1,7 @@
 #include "Camera.h"
 
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
+#include <glm/mat4x4.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
 namespace pymol
diff --git a/layer1/Ray.h b/layer1/Ray.h
index 401205b09..f8c1339c6 100644
--- a/layer1/Ray.h
+++ b/layer1/Ray.h
@@ -19,7 +19,8 @@ Z* -------------------------------------------------------------------
 
 #include <memory>
 #include <vector>
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
+#include <glm/mat4x4.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
 #include"Base.h"
diff --git a/layer1/Scene.cpp b/layer1/Scene.cpp
index 6845ce9e6..e4888db6d 100644
--- a/layer1/Scene.cpp
+++ b/layer1/Scene.cpp
@@ -71,7 +71,8 @@ Z* -------------------------------------------------------------------
 #include <string>
 #include <vector>
 #include <algorithm>
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
+#include <glm/mat4x4.hpp>
 
 static void glReadBufferError(PyMOLGlobals *G, GLenum b, GLenum e){
   PRINTFB(G, FB_OpenGL, FB_Warnings)
diff --git a/layer1/SceneMouse.cpp b/layer1/SceneMouse.cpp
index 72d8dddfc..932516aad 100644
--- a/layer1/SceneMouse.cpp
+++ b/layer1/SceneMouse.cpp
@@ -18,7 +18,9 @@
 #include "Wizard.h"
 #include "Feedback.h"
 
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
+#include <glm/mat4x4.hpp>
+#include <glm/gtc/type_ptr.hpp>
 
 #define cDoubleTime 0.35
 
diff --git a/layer1/SceneView.h b/layer1/SceneView.h
index 19b121175..58f89c0bb 100644
--- a/layer1/SceneView.h
+++ b/layer1/SceneView.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
+#include <glm/mat4x4.hpp>
 
 struct SceneView {
   struct ClippingPlane {
diff --git a/layer2/ObjectCurve.h b/layer2/ObjectCurve.h
index 841583c71..ce27df31a 100644
--- a/layer2/ObjectCurve.h
+++ b/layer2/ObjectCurve.h
@@ -2,7 +2,7 @@
 #include "PyMOLObject.h"
 #include "Result.h"
 
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
 #include <vector>
 
 struct ObjectCurveState : public CObjectState {
diff --git a/layer3/Executive.cpp b/layer3/Executive.cpp
index cea8aa1cc..f4854e123 100644
--- a/layer3/Executive.cpp
+++ b/layer3/Executive.cpp
@@ -112,7 +112,7 @@
 #include "ce_types.h"
 #endif
 
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
 #ifdef WIN32
diff --git a/layer3/Interactions.cpp b/layer3/Interactions.cpp
index 9828c406d..6d0fa188a 100644
--- a/layer3/Interactions.cpp
+++ b/layer3/Interactions.cpp
@@ -16,7 +16,7 @@
 #include "SelectorDef.h"
 #include "AtomIterators.h"
 
-#include <glm/glm.hpp>
+#include <glm/vec3.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
 #include <map>
diff --git a/layerCTest/Test_Bezier.cpp b/layerCTest/Test_Bezier.cpp
index 82e56f548..de014cff8 100644
--- a/layerCTest/Test_Bezier.cpp
+++ b/layerCTest/Test_Bezier.cpp
@@ -2,6 +2,8 @@
 
 #include "Bezier.h"
 
+#include <glm/geometric.hpp>
+
 TEST_CASE("Bezier Spline", "[Bezier]")
 {
   pymol::BezierSpline spline;