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 2023/01/23 23:00:44 UTC
[logging-log4cxx] branch master updated: Put the log4cxx cmake files in the correct location (#182)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/master by this push:
new b2079411 Put the log4cxx cmake files in the correct location (#182)
b2079411 is described below
commit b2079411956092daa43e803ad1148fee430e1009
Author: Robert Middleton <rm...@users.noreply.github.com>
AuthorDate: Mon Jan 23 18:00:38 2023 -0500
Put the log4cxx cmake files in the correct location (#182)
* Put the log4cxx cmake files in the correct location
* Export the messageHandler function
---
CMakeLists.txt | 4 ++--
src/main/include/log4cxx-qt/messagehandler.h | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5503c3a4..7cab7484 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/log4cxxConfigVersion.cmake"
if(LOG4CXX_QT_SUPPORT)
install(EXPORT log4cxx-qtTargets
FILE log4cxx-qtConfig.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/log4cxx
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/log4cxx-qt
)
# Support for find_package(log4cxx 0.11) in consuming CMake projects
include(CMakePackageConfigHelpers)
@@ -184,7 +184,7 @@ if(LOG4CXX_QT_SUPPORT)
COMPATIBILITY SameMinorVersion
)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/log4cxx-qtConfigVersion.cmake"
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/log4cxx
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/log4cxx-qt
)
endif(LOG4CXX_QT_SUPPORT)
diff --git a/src/main/include/log4cxx-qt/messagehandler.h b/src/main/include/log4cxx-qt/messagehandler.h
index 252bac8e..502e5652 100644
--- a/src/main/include/log4cxx-qt/messagehandler.h
+++ b/src/main/include/log4cxx-qt/messagehandler.h
@@ -19,6 +19,8 @@
#include <QString>
+#include "log4cxx/log4cxx.h"
+
namespace log4cxx
{
namespace qt
@@ -34,6 +36,7 @@ namespace qt
* Note that similar to Qt, upon receipt of a fatal message this calls
* std::abort().
*/
+LOG4CXX_EXPORT
void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message);
} /* namespace qt */