You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@logging.apache.org by ts...@apache.org on 2020/04/11 11:39:14 UTC

[logging-log4cxx] 03/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/logging-log4cxx

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

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

commit fc8e5f64579a420132d77debe9a6af6bde7379b2
Merge: 696e8a4 671f0b5
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Sat Apr 11 13:38:32 2020 +0200

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/logging-log4cxx

 CMakeLists.txt                      | 12 +++++++++---
 src/CMakeLists.txt                  |  3 ++-
 src/cmake/FindAPR-Util.cmake        | 13 ++++++++++---
 src/cmake/FindAPR.cmake             | 12 +++++++++---
 src/examples/cpp/CMakeLists.txt     |  3 ++-
 src/main/cpp/CMakeLists.txt         |  1 -
 src/site/apt/building/cmake.apt     | 11 ++++++++++-
 src/test/cpp/CMakeLists.txt         | 10 ++++++++--
 src/test/cpp/db/CMakeLists.txt      |  3 ++-
 src/test/cpp/helpers/CMakeLists.txt |  1 +
 src/test/cpp/util/CMakeLists.txt    |  1 +
 src/test/cpp/xml/CMakeLists.txt     |  2 +-
 12 files changed, 55 insertions(+), 17 deletions(-)