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 2022/12/30 15:45:17 UTC
[logging-log4cxx] branch next_stable updated (bffa0d97 -> 8f30059b)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a change to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
from bffa0d97 LOGCXX-567 (#170)
new 7feb26f9 Update version and soversion for shared library
add 65dddb31 Updated README with some more information
add 3a3d53e6 Fixed options for discussions. (#156)
new 8f30059b Merge branch 'master' into next_stable
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.
Summary of changes:
CMakeLists.txt | 8 ++++++--
README.md | 15 +++++++++++++--
src/cmake/projectVersionDetails.cmake | 2 +-
3 files changed, 20 insertions(+), 5 deletions(-)
[logging-log4cxx] 01/02: Update version and soversion for shared library
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 7feb26f9c405c295c6fc85c0232cb4d88e77fff4
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Fri Dec 30 10:44:01 2022 -0500
Update version and soversion for shared library
---
CMakeLists.txt | 8 ++++++--
src/cmake/projectVersionDetails.cmake | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fca0f7e2..e89881dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,8 +26,12 @@ set(LOG4CXX_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
# 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
-set(LIBLOG4CXX_LIB_VERSION ${log4cxx_VERSION_MINOR}.${log4cxx_VERSION_PATCH}.${log4cxx_VERSION_TWEAK})
-set(LIBLOG4CXX_LIB_SOVERSION ${log4cxx_VERSION_MINOR})
+# See also: https://mail.kde.org/pipermail/kde-buildsystem/2008-April/004543.html
+# Note that the lib version is different from the SOVERSION
+# The lib version is the version of log4cxx, the SOVERSION is the ABI version
+# See also: https://cmake.org/pipermail/cmake/2012-September/051904.html
+set(LIBLOG4CXX_LIB_VERSION ${log4cxx_VERSION_MAJOR}.${log4cxx_VERSION_MINOR}.${log4cxx_VERSION_PATCH}.${log4cxx_VERSION_TWEAK})
+set(LIBLOG4CXX_LIB_SOVERSION 15.0.0)
# Set the 'release' version. This is the human-readable version
set(LOG4CXX_RELEASE_VERSION ${log4cxx_VERSION_MAJOR}.${log4cxx_VERSION_MINOR}.${log4cxx_VERSION_PATCH})
diff --git a/src/cmake/projectVersionDetails.cmake b/src/cmake/projectVersionDetails.cmake
index 93ef36df..45b2c629 100644
--- a/src/cmake/projectVersionDetails.cmake
+++ b/src/cmake/projectVersionDetails.cmake
@@ -2,4 +2,4 @@
# setting the project version. The variable name must not
# clash with the log4cxx_VERSION* variables automatically
# defined by the project() command.
-set(log4cxx_VER 0.13.0.0)
+set(log4cxx_VER 1.0.0.0)
[logging-log4cxx] 02/02: Merge branch 'master' into next_stable
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 8f30059b9099525b0536bc9becaa01f8617479c3
Merge: 7feb26f9 3a3d53e6
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Fri Dec 30 10:44:21 2022 -0500
Merge branch 'master' into next_stable
README.md | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)