This is an automated email from the ASF dual-hosted git repository.
swebb2066 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 ef31a358 Simplify next ABI version testing (#330)
ef31a358 is described below
commit ef31a35802fbce38979e73ea1d3b510f1768102d
Author: Stephen Webb <[email protected]>
AuthorDate: Thu Jan 11 09:58:05 2024 +1100
Simplify next ABI version testing (#330)
---
CMakeLists.txt | 4 ++++
src/cmake/projectVersionDetails.cmake | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27ead9ef..5260d398 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,10 @@ set(LOG4CXX_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
# 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(log4cxx_ABI_VER 15)
+set(next_log4cxx_ABI_VER 16)
+set(log4cxx_ABI_VER "${log4cxx_ABI_VER}" CACHE STRING "The DSO library
version")
+set_property(CACHE log4cxx_ABI_VER PROPERTY STRINGS "${log4cxx_ABI_VER}"
"${next_log4cxx_ABI_VER}")
set(LIBLOG4CXX_LIB_VERSION
${log4cxx_ABI_VER}.${log4cxx_VERSION_MINOR}.${log4cxx_VERSION_PATCH})
set(LIBLOG4CXX_LIB_SOVERSION ${log4cxx_ABI_VER})
# Set the 'release' version. This is the human-readable version
diff --git a/src/cmake/projectVersionDetails.cmake
b/src/cmake/projectVersionDetails.cmake
index cfad4a2d..bbb91eb5 100644
--- a/src/cmake/projectVersionDetails.cmake
+++ b/src/cmake/projectVersionDetails.cmake
@@ -3,4 +3,3 @@
# clash with the log4cxx_VERSION* variables automatically
# defined by the project() command.
set(log4cxx_VER 1.2.0.0)
-set(log4cxx_ABI_VER 15)
