[logging-log4cxx] branch next_stable updated: Turned ABI version into cmake variable

[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


The following commit(s) were added to refs/heads/next_stable by this push:
     new 4628e831 Turned ABI version into cmake variable
4628e831 is described below

commit 4628e831cde17c589fb322daa453edbd39579b58
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Sun Jan 1 12:34:09 2023 -0500

    Turned ABI version into cmake variable
---
 CMakeLists.txt                        | 4 ++--
 src/cmake/projectVersionDetails.cmake | 1 +
 src/main/cpp/CMakeLists.txt           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 897d86f0..5503c3a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,8 @@ 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(LIBLOG4CXX_LIB_VERSION 15.${log4cxx_VERSION_MINOR}.${log4cxx_VERSION_PATCH})
-set(LIBLOG4CXX_LIB_SOVERSION 15)
+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
 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 45b2c629..71f99172 100644
--- a/src/cmake/projectVersionDetails.cmake
+++ b/src/cmake/projectVersionDetails.cmake
@@ -3,3 +3,4 @@
 # clash with the log4cxx_VERSION* variables automatically
 # defined by the project() command.
 set(log4cxx_VER 1.0.0.0)
+set(log4cxx_ABI_VER 15)
diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
index 929745c5..fcf25b88 100644
--- a/src/main/cpp/CMakeLists.txt
+++ b/src/main/cpp/CMakeLists.txt
@@ -239,7 +239,7 @@ if(LOG4CXX_ABI_CHECK)
     set(abi-compliance-script ${abi-compliance-checker_SOURCE_DIR}/abi-compliance-checker.pl)
 
     add_custom_target(dump-abi ALL
-	COMMAND perl ${abi-dumper-script} -o new-abi.dump -skip-cxx -vnum ${PROJECT_VERSION_MINOR} $<TARGET_FILE:log4cxx>
+        COMMAND perl ${abi-dumper-script} -o new-abi.dump -skip-cxx -vnum ${log4cxx_ABI_VER} $<TARGET_FILE:log4cxx>
 	DEPENDS log4cxx
 	COMMENT "Dumping ABI symbols")