From f14020bdb5bd33ea8d822694c5158bb78f95b103 Mon Sep 17 00:00:00 2001
From: Niamh Cuileann <sweet.niamhy@gmail.com>
Date: Sun, 28 Sep 2025 20:36:40 -0400
Subject: [PATCH 1/5] Added glm.cppm to CXX_MODULES target_sources

---
 glm/CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt
index 178d23abdf..8c497430c3 100644
--- a/glm/CMakeLists.txt
+++ b/glm/CMakeLists.txt
@@ -67,3 +67,10 @@ else()
 	add_library(glm::glm ALIAS glm)
 	target_link_libraries(glm INTERFACE glm-header-only)
 endif()
+
+target_sources(glm
+        PUBLIC
+        FILE_SET CXX_MODULES
+        BASE_DIRS .
+        FILES glm.cppm
+)

From 078805bfaaceaeeb3a6a06ccd9d77ca70eec53ee Mon Sep 17 00:00:00 2001
From: Niamh Cuileann <sweet.niamhy@gmail.com>
Date: Mon, 29 Sep 2025 10:13:21 -0400
Subject: [PATCH 2/5] CXX_MODULES doesn't work for interface libraries

---
 glm/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt
index 8c497430c3..2d76dd74f9 100644
--- a/glm/CMakeLists.txt
+++ b/glm/CMakeLists.txt
@@ -62,15 +62,15 @@ if (GLM_BUILD_LIBRARY)
 	)
 	add_library(glm::glm ALIAS glm)
 	target_link_libraries(glm PUBLIC glm-header-only)
+
+    target_sources(glm
+            PUBLIC
+            FILE_SET CXX_MODULES
+            BASE_DIRS .
+            FILES glm.cppm
+    )
 else()
 	add_library(glm INTERFACE)
 	add_library(glm::glm ALIAS glm)
 	target_link_libraries(glm INTERFACE glm-header-only)
 endif()
-
-target_sources(glm
-        PUBLIC
-        FILE_SET CXX_MODULES
-        BASE_DIRS .
-        FILES glm.cppm
-)

From 95c92cf6d30a0012363f4541c6525b655feeb238 Mon Sep 17 00:00:00 2001
From: Niamh Cuileann <sweet.niamhy@gmail.com>
Date: Wed, 12 Nov 2025 21:58:15 -0500
Subject: [PATCH 3/5] PR feedback from Diyou

---
 glm/CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt
index 2d76dd74f9..e720b77a91 100644
--- a/glm/CMakeLists.txt
+++ b/glm/CMakeLists.txt
@@ -50,6 +50,15 @@ target_include_directories(glm-header-only INTERFACE
 	"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 )
 
+add_library(glm-miu STATIC)
+target_sources(glm-miu
+        PUBLIC
+        FILE_SET CXX_MODULES
+        BASE_DIRS .
+        FILES glm.cppm
+)
+target_link_libraries(glm-header-only INTERFACE glm-miu)
+
 if (GLM_BUILD_LIBRARY)
 	add_library(glm
 		${ROOT_TEXT}      ${ROOT_MD}        ${ROOT_NAT}

From 3dee2cdedd2128283c506fda1553e397913d9d1e Mon Sep 17 00:00:00 2001
From: Niamh Cuileann <sweet.niamhy@gmail.com>
Date: Wed, 12 Nov 2025 22:13:23 -0500
Subject: [PATCH 4/5] Missed adding this during commit

---
 glm/CMakeLists.txt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt
index e720b77a91..9ad20a139a 100644
--- a/glm/CMakeLists.txt
+++ b/glm/CMakeLists.txt
@@ -71,13 +71,6 @@ if (GLM_BUILD_LIBRARY)
 	)
 	add_library(glm::glm ALIAS glm)
 	target_link_libraries(glm PUBLIC glm-header-only)
-
-    target_sources(glm
-            PUBLIC
-            FILE_SET CXX_MODULES
-            BASE_DIRS .
-            FILES glm.cppm
-    )
 else()
 	add_library(glm INTERFACE)
 	add_library(glm::glm ALIAS glm)

From e5368901af442baa4b5eaab2f7b70c15b82e59a5 Mon Sep 17 00:00:00 2001
From: Niamh Cuileann <sweet.niamhy@gmail.com>
Date: Wed, 12 Nov 2025 22:20:49 -0500
Subject: [PATCH 5/5] Moving miu behind CXX_20 option

---
 glm/CMakeLists.txt | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt
index 9ad20a139a..2292012d0b 100644
--- a/glm/CMakeLists.txt
+++ b/glm/CMakeLists.txt
@@ -50,14 +50,16 @@ target_include_directories(glm-header-only INTERFACE
 	"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 )
 
-add_library(glm-miu STATIC)
-target_sources(glm-miu
-        PUBLIC
-        FILE_SET CXX_MODULES
-        BASE_DIRS .
-        FILES glm.cppm
-)
-target_link_libraries(glm-header-only INTERFACE glm-miu)
+if (GLM_ENABLE_CXX_20)
+	add_library(glm-miu STATIC)
+	target_sources(glm-miu
+		PUBLIC
+		FILE_SET CXX_MODULES
+		BASE_DIRS .
+		FILES glm.cppm
+	)
+	target_link_libraries(glm-header-only INTERFACE glm-miu)
+endif()
 
 if (GLM_BUILD_LIBRARY)
 	add_library(glm