You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2022/10/26 22:23:18 UTC
[logging-log4cxx] branch LOGCXX-562 updated: Try to fix builds
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch LOGCXX-562
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/LOGCXX-562 by this push:
new 1e1ad982 Try to fix builds
1e1ad982 is described below
commit 1e1ad9824ab5cab77f6288d6bea90d7f4da31723
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Wed Oct 26 18:23:11 2022 -0400
Try to fix builds
---
.github/workflows/log4cxx-cpp11.yml | 1 -
.github/workflows/log4cxx-posix.yml | 2 ++
src/examples/cpp/format-string.cpp | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/log4cxx-cpp11.yml b/.github/workflows/log4cxx-cpp11.yml
index 60a716f6..10236741 100644
--- a/.github/workflows/log4cxx-cpp11.yml
+++ b/.github/workflows/log4cxx-cpp11.yml
@@ -27,7 +27,6 @@ jobs:
path: main
- name: 'Configure Dependencies - Ubuntu'
- if: startsWith( matrix.name,'ubuntu' )
run: |
sudo apt-get update
sudo apt-get install -y libapr1-dev libaprutil1-dev libboost-filesystem-dev libboost-thread-dev
diff --git a/.github/workflows/log4cxx-posix.yml b/.github/workflows/log4cxx-posix.yml
index 649088fd..7f72a3c8 100644
--- a/.github/workflows/log4cxx-posix.yml
+++ b/.github/workflows/log4cxx-posix.yml
@@ -75,6 +75,8 @@ jobs:
cd main
mkdir build
cd build
+ ls /usr/local/include
+ ls /usr/include/fmt
cmake -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} ..
cmake --build .
diff --git a/src/examples/cpp/format-string.cpp b/src/examples/cpp/format-string.cpp
index cab349c1..19dafa37 100644
--- a/src/examples/cpp/format-string.cpp
+++ b/src/examples/cpp/format-string.cpp
@@ -34,7 +34,9 @@ std::ostream& operator<<( std::ostream& stream, const MyStruct& mystruct ){
stream << "[MyStruct x:" << mystruct.x << "]";
return stream;
}
+#if FMT_VERSION >= (9 * 10000)
template <> struct fmt::formatter<MyStruct> : ostream_formatter {};
+#endif
int main()
{