Fixed FMT header define

2019-07-14 16:51:14 +02:00 · 2019-07-14 16:51:14 +02:00 · 1947a2114f
commit 1947a2114f
parent 4ea6d73d86
7 changed files with 14 additions and 0 deletions
--- a/gen_input/templates/vm-vm_CORENAME.cpp.gtl
+++ b/gen_input/templates/vm-vm_CORENAME.cpp.gtl
@ -38,7 +38,9 @@
 #include <iss/llvm/vm_base.h>
 #include <util/logging.h>

+#ifndef FMT_HEADER_ONLY
 #define FMT_HEADER_ONLY
+#endif
 #include <fmt/format.h>

 #include <array>
--- a/incl/iss/arch/riscv_hart_msu_vp.h
+++ b/incl/iss/arch/riscv_hart_msu_vp.h
@ -40,7 +40,9 @@
 #include "iss/instrumentation_if.h"
 #include "iss/log_categories.h"
 #include "iss/vm_if.h"
+#ifndef FMT_HEADER_ONLY
 #define FMT_HEADER_ONLY
+#endif
 #include <fmt/format.h>
 #include <array>
 #include <elfio/elfio.hpp>
--- a/incl/iss/debugger/riscv_target_adapter.h
+++ b/incl/iss/debugger/riscv_target_adapter.h
@ -40,7 +40,9 @@

 #include <array>
 #include <memory>
+#ifndef FMT_HEADER_ONLY
 #define FMT_HEADER_ONLY
+#endif
 #include <fmt/format.h>
 #include <util/logging.h>

--- a/src/internal/vm_rv32gc.cpp
+++ b/src/internal/vm_rv32gc.cpp
@ -38,7 +38,9 @@
 #include <iss/llvm/vm_base.h>
 #include <util/logging.h>

+#ifndef FMT_HEADER_ONLY
 #define FMT_HEADER_ONLY
+#endif
 #include <fmt/format.h>

 #include <array>
--- a/src/internal/vm_rv32imac.cpp
+++ b/src/internal/vm_rv32imac.cpp
@ -38,7 +38,9 @@
 #include <iss/llvm/vm_base.h>
 #include <util/logging.h>

+#ifndef FMT_HEADER_ONLY
 #define FMT_HEADER_ONLY
+#endif
 #include <fmt/format.h>

 #include <array>
--- a/src/internal/vm_rv64gc.cpp
+++ b/src/internal/vm_rv64gc.cpp
@ -38,7 +38,9 @@
 #include <iss/llvm/vm_base.h>
 #include <util/logging.h>

+#ifndef FMT_HEADER_ONLY
 #define FMT_HEADER_ONLY
+#endif
 #include <fmt/format.h>

 #include <array>
--- a/src/internal/vm_rv64i.cpp
+++ b/src/internal/vm_rv64i.cpp
@ -38,7 +38,9 @@
 #include <iss/llvm/vm_base.h>
 #include <util/logging.h>

+#ifndef FMT_HEADER_ONLY
 #define FMT_HEADER_ONLY
+#endif
 #include <fmt/format.h>

 #include <array>