From 5b2be223e4b4d3aef192500dc98b8df763976743 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 16:18:37 -0400 Subject: [PATCH 1/2] fmt: allow version 9 and later The ostream operator wasn't actually used anywhere, so we're good to accept fmt 9 --- gen/cpp/sym/util/type_ops.h | 1 - symforce/opt/CMakeLists.txt | 2 +- symforce/opt/factor.cc | 1 - symforce/opt/internal/tic_toc.cc | 1 - symforce/opt/tic_toc.h | 1 - symforce/opt/values.cc | 1 - symforce/pybind/cc_factor.cc | 1 - symforce/pybind/cc_key.cc | 1 - symforce/pybind/cc_values.cc | 1 - 9 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gen/cpp/sym/util/type_ops.h b/gen/cpp/sym/util/type_ops.h index b681ab856..e78113e43 100644 --- a/gen/cpp/sym/util/type_ops.h +++ b/gen/cpp/sym/util/type_ops.h @@ -8,7 +8,6 @@ #include #include -#include // Import all the known types. #include diff --git a/symforce/opt/CMakeLists.txt b/symforce/opt/CMakeLists.txt index 3c3feff3c..2a42dbb83 100644 --- a/symforce/opt/CMakeLists.txt +++ b/symforce/opt/CMakeLists.txt @@ -12,7 +12,7 @@ include(FetchContent) # ------------------------------------------------------------------------------ # fmtlib -find_package(fmt 8...<9 QUIET) +find_package(fmt 8 QUIET) if (NOT fmt_FOUND) message(STATUS "fmt not found, adding with FetchContent") function(add_fmt) diff --git a/symforce/opt/factor.cc b/symforce/opt/factor.cc index b423249cd..78db61ff8 100644 --- a/symforce/opt/factor.cc +++ b/symforce/opt/factor.cc @@ -6,7 +6,6 @@ #include "./factor.h" #include -#include #include #include "./assert.h" diff --git a/symforce/opt/internal/tic_toc.cc b/symforce/opt/internal/tic_toc.cc index a734695c8..c84d42e7a 100644 --- a/symforce/opt/internal/tic_toc.cc +++ b/symforce/opt/internal/tic_toc.cc @@ -8,7 +8,6 @@ #include #include -#include #include namespace sym { diff --git a/symforce/opt/tic_toc.h b/symforce/opt/tic_toc.h index ffeced747..1f87f2019 100644 --- a/symforce/opt/tic_toc.h +++ b/symforce/opt/tic_toc.h @@ -34,7 +34,6 @@ #else // if !defined(SYMFORCE_TIC_TOC_HEADER) #include -#include #include "./internal/tic_toc.h" diff --git a/symforce/opt/values.cc b/symforce/opt/values.cc index 5f2a67f1a..1cb663dae 100644 --- a/symforce/opt/values.cc +++ b/symforce/opt/values.cc @@ -6,7 +6,6 @@ #include "./values.h" #include -#include #include "./assert.h" diff --git a/symforce/pybind/cc_factor.cc b/symforce/pybind/cc_factor.cc index 910649c3e..2ea5dbf59 100644 --- a/symforce/pybind/cc_factor.cc +++ b/symforce/pybind/cc_factor.cc @@ -10,7 +10,6 @@ #include #include -#include #include #include #include diff --git a/symforce/pybind/cc_key.cc b/symforce/pybind/cc_key.cc index d6ca564f1..a35661946 100644 --- a/symforce/pybind/cc_key.cc +++ b/symforce/pybind/cc_key.cc @@ -6,7 +6,6 @@ #include "./cc_key.h" #include -#include #include diff --git a/symforce/pybind/cc_values.cc b/symforce/pybind/cc_values.cc index 5258047f5..151d7614b 100644 --- a/symforce/pybind/cc_values.cc +++ b/symforce/pybind/cc_values.cc @@ -11,7 +11,6 @@ #include #include -#include #include #include #include From 8a937547bfc507f76c0064b33cd01d73c1cfb7f0 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 16:42:31 -0400 Subject: [PATCH 2/2] spdlog: allow newer versions again now that fmt isn't an issue anymore --- symforce/opt/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/symforce/opt/CMakeLists.txt b/symforce/opt/CMakeLists.txt index 2a42dbb83..7aa07633b 100644 --- a/symforce/opt/CMakeLists.txt +++ b/symforce/opt/CMakeLists.txt @@ -34,7 +34,7 @@ endif() # ------------------------------------------------------------------------------ # spdlog -find_package(spdlog 1.9...<1.11 QUIET) +find_package(spdlog 1.9 QUIET) if (NOT spdlog_FOUND) message(STATUS "spdlog not found, adding with FetchContent") function(add_spdlog)