Skip to content

Commit 19d9b26

Browse files
committed
allowing for spdlog_external
1 parent 0cd21ba commit 19d9b26

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

src/polysolve/Utils.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#include "Utils.hpp"
22

3+
#if defined(SPDLOG_FMT_EXTERNAL)
4+
#include <fmt/color.h>
5+
#else
36
#include <spdlog/fmt/bundled/color.h>
7+
#endif
48

59
namespace polysolve
610
{
@@ -79,4 +83,4 @@ namespace polysolve
7983
return json[name];
8084
}
8185

82-
} // namespace polysolve
86+
} // namespace polysolve

src/polysolve/nonlinear/Solver.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
#include <jse/jse.h>
1515

1616
#include <spdlog/spdlog.h>
17+
#if defined(SPDLOG_FMT_EXTERNAL)
18+
#include <fmt/color.h>
19+
#else
1720
#include <spdlog/fmt/bundled/color.h>
21+
#endif
1822
#include <spdlog/fmt/ostr.h>
1923

2024
#include <finitediff.hpp>

src/polysolve/nonlinear/descent_strategies/Newton.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
#include <polysolve/Utils.hpp>
44

5+
#if defined(SPDLOG_FMT_EXTERNAL)
6+
#include <fmt/color.h>
7+
#else
58
#include <spdlog/fmt/bundled/color.h>
9+
#endif
610

711
namespace polysolve::nonlinear
812
{

src/polysolve/nonlinear/line_search/LineSearch.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99

1010
#include <polysolve/Types.hpp>
1111

12+
#if defined(SPDLOG_FMT_EXTERNAL)
13+
#include <fmt/color.h>
14+
#else
1215
#include <spdlog/fmt/bundled/color.h>
16+
#endif
1317

1418
#include <cfenv>
1519

0 commit comments

Comments
 (0)