#1845: change the include directory for bundled fmt to fmt-vt

DARMA-tasking · Jun 8, 2022 · 4d56ec6 · 4d56ec6
1 parent e85914e
commit 4d56ec6
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 32 deletions.
diff --git a/lib/fmt/CMakeLists.txt b/lib/fmt/CMakeLists.txt
@@ -3,7 +3,7 @@ project(FMT CXX)
 function(add_headers VAR)
   set(headers ${${VAR}})
   foreach (header ${ARGN})
-    set(headers ${headers} include/fmt/${header})
+    set(headers ${headers} include/fmt-vt/${header})
   endforeach()
   set(${VAR} ${headers} PARENT_SCOPE)
 endfunction()
@@ -26,7 +26,7 @@ set_target_properties(fmt PROPERTIES
   DEBUG_POSTFIX "${FMT_DEBUG_POSTFIX}")
 
 install(
-  DIRECTORY                include/fmt
+  DIRECTORY                include/fmt-vt
   DESTINATION              include
   CONFIGURATIONS           ${build_type_list}
   FILES_MATCHING PATTERN   "*"

diff --git a/lib/fmt/include/fmt/core.h → lib/fmt/include/fmt-vt/core.h b/lib/fmt/include/fmt/core.h → lib/fmt/include/fmt-vt/core.h
@@ -2064,7 +2064,7 @@ FMT_INLINE std::basic_string<Char> vformat(
 
   **Example**::
 
-    #include <fmt/core.h>
+    #include <fmt-vt/core.h>
     std::string message = fmt::format("The answer is {}", 42);
   \endrst
 */

diff --git a/lib/fmt/include/fmt/format-inl.h → lib/fmt/include/fmt-vt/format-inl.h b/lib/fmt/include/fmt/format-inl.h → lib/fmt/include/fmt-vt/format-inl.h
diff --git a/lib/fmt/include/fmt/format.h → lib/fmt/include/fmt-vt/format.h b/lib/fmt/include/fmt/format.h → lib/fmt/include/fmt-vt/format.h
@@ -3721,7 +3721,7 @@ arg_join<detail::iterator_t<Range>, detail::sentinel_t<Range>, wchar_t> join(
 
   **Example**::
 
-    #include <fmt/format.h>
+    #include <fmt-vt/format.h>
 
     std::string answer = fmt::to_string(42);
   \endrst

diff --git a/lib/fmt/include/fmt/ostream.h → lib/fmt/include/fmt-vt/ostream.h b/lib/fmt/include/fmt/ostream.h → lib/fmt/include/fmt-vt/ostream.h
diff --git a/lib/fmt/src/format.cc b/lib/fmt/src/format.cc
@@ -5,7 +5,7 @@
 //
 // For the license information refer to format.h.
 
-#include "fmt/format-inl.h"
+#include "fmt-vt/format-inl.h"
 
 FMT_BEGIN_NAMESPACE
 namespace detail {

diff --git a/src/vt/configs/debug/debug_fmt.h b/src/vt/configs/debug/debug_fmt.h
@@ -46,7 +46,7 @@
 
 #include "vt/config.h"
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 #include <iosfwd>
 

diff --git a/src/vt/configs/debug/debug_print.h b/src/vt/configs/debug/debug_print.h
@@ -49,7 +49,7 @@
 #include "vt/configs/debug/debug_colorize.h"
 #include "vt/configs/debug/debug_var_unused.h"
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 /*
    === Debug file/line/func functionality ===

diff --git a/src/vt/configs/error/assert_out.impl.h b/src/vt/configs/error/assert_out.impl.h
@@ -56,7 +56,7 @@
 #include <string>
 #include <cassert>
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt { namespace debug { namespace assert {
 

diff --git a/src/vt/configs/error/assert_out_info.impl.h b/src/vt/configs/error/assert_out_info.impl.h
@@ -57,7 +57,7 @@
 #include <string>
 #include <sstream>
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt { namespace debug { namespace assert {
 

diff --git a/src/vt/configs/error/error.impl.h b/src/vt/configs/error/error.impl.h
@@ -55,7 +55,7 @@
 #include <tuple>
 #include <type_traits>
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt { namespace error {
 

diff --git a/src/vt/configs/error/keyval_printer.impl.h b/src/vt/configs/error/keyval_printer.impl.h
@@ -53,7 +53,7 @@
 #include <string>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt { namespace util { namespace error {
 

diff --git a/src/vt/configs/error/pretty_print_message.cc b/src/vt/configs/error/pretty_print_message.cc
@@ -50,7 +50,7 @@
 #include <string>
 #include <unistd.h> // gethostname
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt { namespace debug {
 

diff --git a/src/vt/configs/error/soft_error.h b/src/vt/configs/error/soft_error.h
@@ -59,7 +59,7 @@
 
 #include <string>
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt {
 

diff --git a/src/vt/elm/elm_id.h b/src/vt/elm/elm_id.h
@@ -94,7 +94,7 @@ struct hash<vt::elm::ElementIDStruct> {
 
 } /* end namespace std */
 
-#include <fmt/format.h>
+#include <fmt-vt/format.h>
 
 namespace fmt {
 

diff --git a/src/vt/epoch/epoch_manip.cc b/src/vt/epoch/epoch_manip.cc
@@ -49,7 +49,7 @@
 #include "vt/utils/bits/bits_packer.h"
 #include "vt/termination/term_common.h"
 
-#include <fmt/ostream.h>
+#include <fmt-vt/ostream.h>
 
 namespace vt { namespace epoch {
 

diff --git a/src/vt/epoch/epoch_type.h b/src/vt/epoch/epoch_type.h
@@ -108,7 +108,7 @@ struct hash<vt::epoch::EpochType> {
 
 } /* end namespace std */
 
-#include <fmt/format.h>
+#include <fmt-vt/format.h>
 
 namespace fmt {
 

diff --git a/src/vt/epoch/epoch_window.cc b/src/vt/epoch/epoch_window.cc
@@ -44,7 +44,7 @@
 #include "vt/epoch/epoch_window.h"
 #include "vt/epoch/epoch_manip.h"
 
-#include <fmt/ostream.h>
+#include <fmt-vt/ostream.h>
 
 namespace vt { namespace epoch {
 

diff --git a/src/vt/runtime/component/diagnostic_value_format.h b/src/vt/runtime/component/diagnostic_value_format.h
@@ -49,7 +49,7 @@
 #include "vt/runtime/component/diagnostic_enum_format.h"
 #include "vt/utils/memory/memory_units.h"
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt { namespace runtime { namespace component { namespace detail {
 

diff --git a/src/vt/runtime/runtime_diagnostics.cc b/src/vt/runtime/runtime_diagnostics.cc
@@ -56,7 +56,7 @@
 #include <fort.hpp>
 #endif /*vt_check_enabled(libfort)*/
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 #include <map>
 #include <string>

diff --git a/src/vt/termination/interval/interval.h b/src/vt/termination/interval/interval.h
@@ -48,7 +48,7 @@
 
 #include <ostream>
 
-#include <fmt/ostream.h>
+#include <fmt-vt/ostream.h>
 
 namespace vt { namespace term { namespace interval {
 

diff --git a/src/vt/timing/timing.h b/src/vt/timing/timing.h
@@ -47,7 +47,7 @@
 #include <string>
 
 #include <EngFormat-Cpp/eng_format.hpp>
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 #include "vt/timing/timing_type.h"
 

diff --git a/src/vt/utils/adt/histogram_approx.h b/src/vt/utils/adt/histogram_approx.h
@@ -52,7 +52,7 @@
 #include <cmath>
 #include <algorithm>
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt { namespace util { namespace adt {
 

diff --git a/src/vt/utils/json/json_appender.h b/src/vt/utils/json/json_appender.h
@@ -49,7 +49,7 @@
 
 #include <nlohmann/json.hpp>
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt { namespace util { namespace json {
 

diff --git a/src/vt/vrt/collection/balance/node_lb_data.cc b/src/vt/vrt/collection/balance/node_lb_data.cc
@@ -58,7 +58,7 @@
 #include <sys/stat.h>
 #include <memory>
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 namespace vt { namespace vrt { namespace collection { namespace balance {
 

diff --git a/src/vt/vrt/collection/manager.impl.h b/src/vt/vrt/collection/manager.impl.h
@@ -89,8 +89,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <fmt/core.h>
-#include <fmt/ostream.h>
+#include <fmt-vt/core.h>
+#include <fmt-vt/ostream.h>
 
 namespace vt { namespace vrt { namespace collection {
 

diff --git a/tests/perf/ping_pong.cc b/tests/perf/ping_pong.cc
@@ -45,7 +45,7 @@
 #include <vt/objgroup/manager.h>
 #include <vt/messaging/active.h>
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 
 using namespace vt;
 using namespace vt::tests::perf::common;

diff --git a/tests/unit/collection/test_collection_common.h b/tests/unit/collection/test_collection_common.h
@@ -47,8 +47,8 @@
 #include <vt/topos/index/index.h>
 #include <vt/context/context.h>
 
-#include <fmt/core.h>
-#include <fmt/ostream.h>
+#include <fmt-vt/core.h>
+#include <fmt-vt/ostream.h>
 
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/collection/test_collection_construct_common.h b/tests/unit/collection/test_collection_construct_common.h
@@ -49,8 +49,8 @@
 #include "vt/vrt/collection/manager.h"
 #include "data_message.h"
 
-#include <fmt/core.h>
-#include <fmt/ostream.h>
+#include <fmt-vt/core.h>
+#include <fmt-vt/ostream.h>
 
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/configs/test_stack_dumping.cc b/tests/unit/configs/test_stack_dumping.cc
@@ -41,7 +41,7 @@
 //@HEADER
 */
 
-#include <fmt/core.h>
+#include <fmt-vt/core.h>
 #include <gtest/gtest.h>
 
 #include "test_parallel_harness.h"