(logging-log4cxx) branch master updated: reorder LOG4CXX_NS cmake variable definition/usage (#350)

[rm...@apache.org]

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 52770c36 reorder LOG4CXX_NS cmake variable definition/usage (#350)
52770c36 is described below

commit 52770c36f1c3c44117c4c9a064d207987b176726
Author: vopl <vo...@bk.ru>
AuthorDate: Mon Feb 12 16:53:15 2024 +0300

    reorder LOG4CXX_NS cmake variable definition/usage (#350)
---
 CMakeLists.txt                  | 3 +++
 src/main/include/CMakeLists.txt | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b7b899f..e0af9905 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,9 @@ include(CTest)
 # in relation to the log4cxx source root, set a variable that contains the log4cxx root.
 set(LOG4CXX_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
+# The namespace in which all log4cxx entities will be placed, default value is "log4cxx"
+set(LOG4CXX_NS "log4cxx" CACHE STRING "Root namespace name")
+
 # define the SO Version of the library. Version of the log4cxx project is subtly different than the version of the library
 # (at least in the past it was project vesion: 0.a.b.c and the library so vesion a.b.c.0
 # See also: https://mail.kde.org/pipermail/kde-buildsystem/2008-April/004543.html
diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt
index ac7bff2d..e078865a 100644
--- a/src/main/include/CMakeLists.txt
+++ b/src/main/include/CMakeLists.txt
@@ -79,7 +79,6 @@ else()
     set(EVENTS_AT_EXIT 0)
 endif()
 
-set(LOG4CXX_NS "log4cxx" CACHE STRING "Root namespace name")
 set(LOG4CXX_DECLARE_DEFAULT_NS_ALIAS 0)
 if(NOT "log4cxx" STREQUAL "${LOG4CXX_NS}")
     set(LOG4CXX_DECLARE_DEFAULT_NS_ALIAS 1)