From cd2d7d7d5d3748121f86c688a1faf09536a38062 Mon Sep 17 00:00:00 2001
From: David Thompson <david.thompson@kitware.com>
Date: Mon, 26 Aug 2024 23:12:46 -0400
Subject: [PATCH 1/3] Fix for macos.

---
 token/Singletons.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/token/Singletons.cxx b/token/Singletons.cxx
index 7f5a1d6..fcc921c 100644
--- a/token/Singletons.cxx
+++ b/token/Singletons.cxx
@@ -24,7 +24,10 @@ TypeContainer& singletons()
 
 void finalizeSingletons()
 {
-  std::lock_guard<std::mutex> guard(s_singletonsMutex);
+  // Per @michael.migliore this can cause exceptions on macos in cases
+  // when the mutex is destroyed before finalizeSingletons() is called:
+  // std::lock_guard<std::mutex> guard(s_singletonsMutex);
+
   delete s_singletons;
   s_singletons = nullptr;
 }
-- 
GitLab


From ad2e226157e3f27c451c364987cd90b0bbf0845a Mon Sep 17 00:00:00 2001
From: David Thompson <david.thompson@kitware.com>
Date: Mon, 26 Aug 2024 23:13:43 -0400
Subject: [PATCH 2/3] Eliminate bad whitespace.

---
 cmake/tokenPostInstall.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/tokenPostInstall.cmake b/cmake/tokenPostInstall.cmake
index 5c9244d..62192e4 100644
--- a/cmake/tokenPostInstall.cmake
+++ b/cmake/tokenPostInstall.cmake
@@ -43,4 +43,3 @@ configure_file(
 
 install (FILES ${PROJECT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake
          DESTINATION ${token_INSTALL_CONFIG_DIR})
-
-- 
GitLab


From 8d290e507afc26aa94972de781a386644d16ef5b Mon Sep 17 00:00:00 2001
From: David Thompson <david.thompson@kitware.com>
Date: Mon, 26 Aug 2024 23:14:51 -0400
Subject: [PATCH 3/3] Eliminate unneeded includes.

---
 token/json/jsonManager.h | 1 -
 token/json/jsonToken.h   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/token/json/jsonManager.h b/token/json/jsonManager.h
index 30cc344..b823c23 100644
--- a/token/json/jsonManager.h
+++ b/token/json/jsonManager.h
@@ -10,7 +10,6 @@
 #ifndef token_json_jsonManager_h
 #define token_json_jsonManager_h
 
-#include "token/Exports.h"
 #include "token/Manager.h"
 
 #include "nlohmann/json.hpp"
diff --git a/token/json/jsonToken.h b/token/json/jsonToken.h
index b1d1371..d86d7dc 100644
--- a/token/json/jsonToken.h
+++ b/token/json/jsonToken.h
@@ -10,7 +10,6 @@
 #ifndef token_json_jsonToken_h
 #define token_json_jsonToken_h
 
-#include "token/Exports.h"
 #include "token/Token.h"
 
 #include "nlohmann/json.hpp"
-- 
GitLab