Enforce minimum fmt version 6.1.0 to ensure float roundtrip

2021-11-20 13:01:57 +01:00 · 2021-11-20 13:01:57 +01:00 · aac69395bb
parent 7c38b34683
commit aac69395bb
3 changed files with 9 additions and 1 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -4,3 +4,6 @@
 [submodule "content"]
 	path = content
 	url = https://github.com/CelestiaProject/CelestiaContent.git
+[submodule "thirdparty/fmt"]
+	path = thirdparty/fmt
+	url = https://github.com/fmtlib/fmt.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -210,7 +210,11 @@ find_package(Eigen3 3.3 REQUIRED NO_MODULE) # -DEigen3_DIR=...
 message(STATUS "Found Eigen3 ${EIGEN3_VERSION_STRING}")
 link_libraries(Eigen3::Eigen)

-find_package(fmt REQUIRED)
+find_package(fmt 6.1.0 CONFIG QUIET)
+if(NOT fmt_FOUND)
+  message(STATUS "Using fmt submodule")
+  add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/fmt")
+endif()
 link_libraries(fmt::fmt)

 find_package(PNG REQUIRED)
--- a/thirdparty/fmt
+++ b/thirdparty/fmt
@ -0,0 +1 @@
+Subproject commit 4ca6821e8f26c96f815064f77dff0a74f562bffb
				`@ -0,0 +1 @@`
				`Subproject commit 4ca6821e8f26c96f815064f77dff0a74f562bffb`