Organize spdlog imports and fix fmt symbol issue.

Reorganize spdlog headers in CSVWriter.h and remove unused imports in other files to clean up code dependencies. Add a compile definition in CMakeLists.txt to resolve missing fmt symbols.
esa · Nov 28, 2024 · 62323b9 · 62323b9
1 parent abe2c43
commit 62323b9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,6 +53,10 @@ IF(_LIBCPP_DISABLE_AVAILABILITY)
     add_definitions(-D_LIBCPP_DISABLE_AVAILABILITY)
 endif ()
 
+# Resolves missing fmt symbols when working with spdlog (bundled via brew/ conda on Arm architecture)
+# Refer to https://github.com/gabime/spdlog/issues/660
+add_compile_definitions(FMT_HEADER_ONLY)
+
 #######################################################
 # Including dependencies needed across multiple targets
 #######################################################

diff --git a/src/polyhedralGravity/model/GravityModelDetail.h b/src/polyhedralGravity/model/GravityModelDetail.h
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <variant>
 
-#include "spdlog/spdlog.h"
 #include "thrust/iterator/zip_iterator.h"
 #include "thrust/iterator/transform_iterator.h"
 #include "thrust/iterator/counting_iterator.h"

diff --git a/src/polyhedralGravity/output/CSVWriter.h b/src/polyhedralGravity/output/CSVWriter.h
@@ -6,9 +6,9 @@
 #include <utility>
 #include <memory>
 #include "polyhedralGravity/model/GravityModelData.h"
+#include "spdlog/spdlog.h"
 #include "spdlog/sinks/basic_file_sink.h"
 #include "spdlog/fmt/ostr.h"
-#include "spdlog/spdlog.h"
 
 namespace polyhedralGravity {
 

diff --git a/test/model/GravityModelVectorUtility.h b/test/model/GravityModelVectorUtility.h
@@ -8,7 +8,6 @@
 #include "polyhedralGravity/model/GravityModelData.h"
 #include "polyhedralGravity/util/UtilityConstants.h"
 #include "polyhedralGravity/util/UtilityContainer.h"
-#include "spdlog/spdlog.h"
 #include "thrust/iterator/zip_iterator.h"
 #include "thrust/iterator/transform_iterator.h"
 #include "thrust/iterator/counting_iterator.h"