You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2019/12/15 22:13:07 UTC
[celix] branch develop updated: Issues in log_writer_syslog solved
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/develop by this push:
new 2550555 Issues in log_writer_syslog solved
new f186b20 Merge pull request #132 from gerritbinnenmars/develop
2550555 is described below
commit 2550555dce841b5e8945bb14e79fd0b6f14df3af
Author: root <ro...@localhost.localdomain>
AuthorDate: Sun Dec 15 16:09:31 2019 +0100
Issues in log_writer_syslog solved
---
.../log_writer_syslog/private/src/log_writer_syslog.c | 2 +-
cmake/Modules/FindSyslog.cmake | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/bundles/logging/log_writer/log_writer_syslog/private/src/log_writer_syslog.c b/bundles/logging/log_writer/log_writer_syslog/private/src/log_writer_syslog.c
index a49bcb4..6f8e8af 100644
--- a/bundles/logging/log_writer/log_writer_syslog/private/src/log_writer_syslog.c
+++ b/bundles/logging/log_writer/log_writer_syslog/private/src/log_writer_syslog.c
@@ -23,7 +23,7 @@
#include "celix_errno.h"
#include "celixbool.h"
-#include "log_writer.h"
+#include "celix_log_writer.h"
#include "log_listener.h"
#include "module.h"
diff --git a/cmake/Modules/FindSyslog.cmake b/cmake/Modules/FindSyslog.cmake
index 2345893..f238538 100644
--- a/cmake/Modules/FindSyslog.cmake
+++ b/cmake/Modules/FindSyslog.cmake
@@ -21,19 +21,19 @@
# JANSSON_INCLUDE_DIRS - The Syslog include directories
# SYSLOG::lib - Imported target for Syslog
-find_path(Syslog_INCLUDE_DIR syslog.h /usr/include)
+find_path(SYSLOG_INCLUDE_DIR syslog.h /usr/include)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Syslog DEFAULT_MSG
+find_package_handle_standard_args(SYSLOG DEFAULT_MSG
SYSLOG_INCLUDE_DIR)
-set(Syslog_INCLUDE_DIRS ${Syslog_INCLUDE_DIR})
-mark_as_advanced(Syslog_INCLUDE_DIR)
+set(Syslog_INCLUDE_DIRS ${SYSLOG_INCLUDE_DIR})
+mark_as_advanced(SYSLOG_INCLUDE_DIR)
-if (Syslog_FOUND AND NOT TARGET Syslog::lib)
- add_library(Syslog::lib SHARED IMPORTED)
- set_target_properties(Syslog::lib PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Syslog_INCLUDE_DIR}"
+if (SYSLOG_FOUND AND NOT TARGET SYSLOG::lib)
+ add_library(SYSLOG::lib SHARED IMPORTED)
+ set_target_properties(SYSLOG::lib PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${SYSLOG_INCLUDE_DIR}"
)
-endif ()
\ No newline at end of file
+endif ()