Set up fmt

This commit finalizes fixing spdlog::info(...) commit chain.
ssayin · Jul 27, 2024 · 80af6b8 · 80af6b8
1 parent bf5aceb
commit 80af6b8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "external/riscv-arch-test"]
 	path = external/riscv-arch-test
 	url = https://github.com/riscv-non-isa/riscv-arch-test.git
+[submodule "external/fmt"]
+	path = external/fmt
+	url = https://github.com/fmtlib/fmt.git
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -6,6 +6,7 @@ add_subdirectory(ELFIO)
 add_subdirectory(riscv-disas)
 add_subdirectory(CLI11)
 add_subdirectory(json)
+add_subdirectory(fmt)
 
 add_library(boost_asio INTERFACE)
 add_library(Boost::asio ALIAS boost_asio)

diff --git a/external/fmt b/external/fmt
diff --git a/riscv32-sim/CMakeLists.txt b/riscv32-sim/CMakeLists.txt
@@ -65,7 +65,7 @@ target_link_libraries(
           CLI11
           riscv_disas
           nlohmann_json
-          spdlog_header_only
+          fmt::fmt
           $<$<BOOL:${MINGW}>:ws2_32>
           ${TCP_LIB}
           riscv32-sim-common

diff --git a/riscv32-sim/include/util/format_helpers.hpp b/riscv32-sim/include/util/format_helpers.hpp
@@ -9,8 +9,8 @@
 #include <iterator>
 #include <ostream>
 
-#include "spdlog/fmt/bundled/core.h"
-#include "spdlog/spdlog.h"
+#include "fmt/core.h"
+#include "fmt/format.h"
 
 extern "C" {
 #include "riscv-disas.h"

diff --git a/tools/build.sh b/tools/build.sh
@@ -17,7 +17,7 @@ cmake -B $BUILD_DIR -GNinja \
   -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
   -DCOVERAGE=ON \
   -DISA_TESTS_DIR=$ISA_TESTS_DIR \
-  -DENABLE_TCP=ON \
+  -DENABLE_TCP=OFF \
   -DBUILD_RUNTIME=ON \
   -DTEST_EXPORT_JSON_HART_STATE=ON \
   -DENABLE_UBENCHMARKS=OFF