Allow for a FMT layout configuration when log4cxx is statically linked

apache · Oct 25, 2024 · b68a3c7 · b68a3c7
1 parent 0ff3c8a
commit b68a3c7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/main/cpp/class.cpp b/src/main/cpp/class.cpp
@@ -50,6 +50,9 @@
 #include <log4cxx/htmllayout.h>
 #include <log4cxx/simplelayout.h>
 #include <log4cxx/xml/xmllayout.h>
+#if LOG4CXX_HAS_FMT_LAYOUT
+#include <log4cxx/fmtlayout.h>
+#endif
 
 #include <log4cxx/filter/levelmatchfilter.h>
 #include <log4cxx/filter/levelrangefilter.h>
@@ -183,6 +186,9 @@ void Class::registerClasses()
 	SMTPAppender::registerClass();
 	JSONLayout::registerClass();
 	HTMLLayout::registerClass();
+#if LOG4CXX_HAS_FMT_LAYOUT
+	FMTLayout::registerClass();
+#endif
 	PatternLayout::registerClass();
 	SimpleLayout::registerClass();
 	XMLLayout::registerClass();

diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt
@@ -65,6 +65,12 @@ else()
     set(DOMCONFIGURATOR_SUPPORT 0)
 endif()
 
+if(ENABLE_FMT_LAYOUT)
+    set(FMT_LAYOUT_SUPPORT 1)
+else()
+    set(FMT_LAYOUT_SUPPORT 0)
+endif()
+
 option(LOG4CXX_MULTIPROCESS_ROLLING_FILE_APPENDER "Support multiple processes logging to the same file" OFF)
 if(LOG4CXX_MULTIPROCESS_ROLLING_FILE_APPENDER)
     set(MULTIPROCESS_RFA 1)

diff --git a/src/main/include/log4cxx/log4cxx.h.in b/src/main/include/log4cxx/log4cxx.h.in
@@ -53,6 +53,7 @@
 #define LOG4CXX_HAS_MULTIPROCESS_ROLLING_FILE_APPENDER @MULTIPROCESS_RFA@
 #define LOG4CXX_EVENTS_AT_EXIT @EVENTS_AT_EXIT@
 #define LOG4CXX_HAS_DOMCONFIGURATOR @DOMCONFIGURATOR_SUPPORT@
+#define LOG4CXX_HAS_FMT_LAYOUT @FMT_LAYOUT_SUPPORT@
 
 
 #define LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE 0