add sandboxed version of fmt

LLNL · Nov 12, 2020 · d8a3ed3 · d8a3ed3
1 parent 125519d
commit d8a3ed3
Show file tree

Hide file tree

Showing 32 changed files with 13,240 additions and 9,315 deletions.
diff --git a/src/cmake/Setup3rdParty.cmake b/src/cmake/Setup3rdParty.cmake
@@ -47,7 +47,7 @@ include_directories(thirdparty_builtin/civetweb-0a95342/include)
 ################################
 # Setup includes for fmt
 ################################
-include_directories(thirdparty_builtin/fmt-5.0.3/)
+include_directories(thirdparty_builtin/fmt-7.1.0/)
 
 
 ################################

diff --git a/src/tests/thirdparty/t_fmt_smoke.cpp b/src/tests/thirdparty/t_fmt_smoke.cpp
@@ -51,10 +51,16 @@
 #include <iostream>
 #include "gtest/gtest.h"
 
-#include "fmt/conduit_fmt.h"
+#include "conduit_fmt/conduit_fmt.h"
 
-TEST(libb64_smoke, basic_use )
+TEST(fmt_smoke, basic_use )
 {
-    std::string res = fmt::format("The answer is {}.", 42);
+    std::string res = conduit_fmt::format("The answer is {}.", 42);
+    std::cout << res << std::endl;
     EXPECT_EQ(res, "The answer is 42.");
+
+    res = conduit_fmt::format("The answer is {answer:0.2f}.",
+                conduit_fmt::arg("answer",3.14));
+    std::cout << res << std::endl;
+    EXPECT_EQ(res, "The answer is 3.14.");
 }
diff --git a/src/thirdparty_builtin/fmt-5.0.3/conduit_readme.txt b/src/thirdparty_builtin/fmt-5.0.3/conduit_readme.txt