From 040321428a3d30344799ebd73bbf09768926a45e Mon Sep 17 00:00:00 2001
From: Stefano Tognini <togninis@ornl.gov>
Date: Wed, 20 Sep 2023 16:48:31 -0500
Subject: [PATCH 1/2] Fix minor build issues

---
 app/celer-g4/TimerOutput.hh |  1 +
 test/CMakeLists.txt         | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/celer-g4/TimerOutput.hh b/app/celer-g4/TimerOutput.hh
index 99337afe89..e4ff02b2a5 100644
--- a/app/celer-g4/TimerOutput.hh
+++ b/app/celer-g4/TimerOutput.hh
@@ -7,6 +7,7 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
+#include <unordered_map>
 #include <vector>
 #include <G4Event.hh>
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e9a99a089e..894827f574 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -30,6 +30,16 @@ celeritas_target_include_directories(testcel_harness
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
 
+if (CELERITAS_USE_JSON)
+  celeritas_target_include_directories(testcel_harness
+    PUBLIC
+      $<BUILD_INTERFACE:${NLOHMANN_INCLUDE_DIR}>
+  )
+  celeritas_target_link_libraries(testcel_harness
+    PUBLIC nlohmann_json::nlohmann_json
+  )
+endif()
+
 #-----------------------------------------------------------------------------#
 # HIP SUPPORT
 #-----------------------------------------------------------------------------#

From d3de2786f4d395cfa3461fa7d528c87a01338116 Mon Sep 17 00:00:00 2001
From: Seth R Johnson <johnsonsr@ornl.gov>
Date: Thu, 21 Sep 2023 05:58:53 -0400
Subject: [PATCH 2/2] Smarter json usage

---
 test/CMakeLists.txt | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 894827f574..1661dc8b11 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,6 +23,7 @@ celeritas_add_library(testcel_harness
 target_compile_features(testcel_harness PUBLIC cxx_std_14)
 celeritas_target_link_libraries(testcel_harness
   PUBLIC Celeritas::corecel GTest::GTest
+  PRIVATE ${nlohmann_json_LIBRARIES}
 )
 celeritas_target_include_directories(testcel_harness
   PUBLIC
@@ -30,16 +31,6 @@ celeritas_target_include_directories(testcel_harness
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
 
-if (CELERITAS_USE_JSON)
-  celeritas_target_include_directories(testcel_harness
-    PUBLIC
-      $<BUILD_INTERFACE:${NLOHMANN_INCLUDE_DIR}>
-  )
-  celeritas_target_link_libraries(testcel_harness
-    PUBLIC nlohmann_json::nlohmann_json
-  )
-endif()
-
 #-----------------------------------------------------------------------------#
 # HIP SUPPORT
 #-----------------------------------------------------------------------------#