[logging-log4cxx] branch logcxx_510_ts created (now 24870b5)

[ts...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tschoening pushed a change to branch logcxx_510_ts
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git.


      at 24870b5  "log4cxx.rc" can only be found using a relative path.

This branch includes the following new commits:

     new ce32ad6  "CMP0079" needs to be enabled for EXPAT as well.
     new 24870b5  "log4cxx.rc" can only be found using a relative path.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[logging-log4cxx] 02/02: "log4cxx.rc" can only be found using a relative path.

[ts...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tschoening pushed a commit to branch logcxx_510_ts
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git

commit 24870b54779434f671b2d115f2064b3eb5c7707e
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Mon Jan 4 21:17:32 2021 +0100

    "log4cxx.rc" can only be found using a relative path.
---
 src/main/cpp/CMakeLists.txt       | 3 ++-
 src/main/resources/CMakeLists.txt | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
index 213ece5..ffe2429 100644
--- a/src/main/cpp/CMakeLists.txt
+++ b/src/main/cpp/CMakeLists.txt
@@ -3,7 +3,7 @@
 option(LOG4CXX_BLOCKING_ASYNC_APPENDER "Async appender behaviour" ON)
 
 # Build the log4cxx library
-add_library(log4cxx action.cpp)
+add_library(log4cxx)
 if(BUILD_SHARED_LIBS)
     target_compile_definitions(log4cxx PRIVATE LOG4CXX)
 else()
@@ -12,6 +12,7 @@ endif()
 add_dependencies(log4cxx configure_log4cxx)
 target_sources(log4cxx
   PRIVATE
+  action.cpp
   andfilter.cpp
   appenderattachableimpl.cpp
   appenderskeleton.cpp
diff --git a/src/main/resources/CMakeLists.txt b/src/main/resources/CMakeLists.txt
index 3827357..b60f192 100644
--- a/src/main/resources/CMakeLists.txt
+++ b/src/main/resources/CMakeLists.txt
@@ -2,6 +2,6 @@
 if(WIN32)
 target_sources(log4cxx
   PRIVATE
-  log4cxx.rc
+  ../resources/log4cxx.rc
 )
-endif()
\ No newline at end of file
+endif()

[logging-log4cxx] 01/02: "CMP0079" needs to be enabled for EXPAT as well.

[ts...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tschoening pushed a commit to branch logcxx_510_ts
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git

commit ce32ad69ce396561ceee34b3f0b5025299ded192
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Mon Jan 4 21:17:10 2021 +0100

    "CMP0079" needs to be enabled for EXPAT as well.
---
 src/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aa2d16e..b1be4ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,11 @@
+cmake_policy(SET CMP0079 NEW)
+
 add_subdirectory(main)
 target_compile_definitions(log4cxx PRIVATE ${LOG4CXX_COMPILE_DEFINITIONS} ${APR_COMPILE_DEFINITIONS} ${APR_UTIL_COMPILE_DEFINITIONS} )
 target_include_directories(log4cxx INTERFACE $<INSTALL_INTERFACE:include> PRIVATE ${APR_INCLUDE_DIR} ${APR_UTIL_INCLUDE_DIR})
 target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT ${APR_LIBRARIES} ${APR_SYSTEM_LIBS})
 if(WIN32)
 # The ODBC appender is always enabled in the Windows configuration
-cmake_policy(SET CMP0079 NEW)
 target_link_libraries(log4cxx PRIVATE odbc32.lib)
 option(LOG4CXX_INSTALL_PDB "Install .pdb files (if generated)"  ON)
 endif()