Merge pull request #480 from wilx/2.0.x-cmake-so-version

Deal better with SO version in CMake builds. Fixes #479.
log4cplus · Nov 8, 2020 · 47f7876 · 47f7876
2 parents 62cc851 + bf6b27f
commit 47f7876
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,8 +34,12 @@ include (Log4CPlusUtils.cmake)
 log4cplus_get_version ("${PROJECT_SOURCE_DIR}/include"
   log4cplus_version_major log4cplus_version_minor log4cplus_version_patch)
 message("-- Generating build for Log4cplus version ${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}")
-set (log4cplus_soversion 0)
+set (log4cplus_soversion 3)
 set (log4cplus_postfix "")
+if (APPLE)
+  set (log4cplus_macho_current_version 7.0.0)
+  set (log4cplus_macho_compatibility_version 3.0.0)
+endif ()
 
 option(LOG4CPLUS_BUILD_TESTING "Build the test suite." ON)
 option(LOG4CPLUS_BUILD_LOGGINGSERVER "Build the logging server." ON)

diff --git a/qt4debugappender/CMakeLists.txt b/qt4debugappender/CMakeLists.txt
@@ -19,11 +19,23 @@ target_link_libraries (${qt4debugappender}
   ${QT_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT})
 
-set_target_properties (${qt4debugappender} PROPERTIES
-  VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}"
-  SOVERSION "${log4cplus_soversion}")
+if (ANDROID)
+  # Android does not seem to have SO version support.
+elseif (WIN32)
+  set_target_properties (${qt4debugappender} PROPERTIES
+    VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}")
+else ()
+  set_target_properties (${qt4debugappender} PROPERTIES
+    SOVERSION "${log4cplus_soversion}")
+endif ()
 target_compile_definitions (${qt4debugappender} PRIVATE INSIDE_LOG4CPLUS_QT4DEBUGAPPENDER)
 
+if (APPLE)
+  set_target_properties (${log4cplus} PROPERTIES
+    MACHO_CURRENT_VERSION "${log4cplus_macho_current_version}"
+    MACHO_COMPATIBILITY_VERSION "${log4cplus_macho_compatibility_version}")
+endif ()
+
 if (WIN32)
   set_target_properties (${qt4debugappender} PROPERTIES
     DEBUG_POSTFIX "D")

diff --git a/qt5debugappender/CMakeLists.txt b/qt5debugappender/CMakeLists.txt
@@ -19,11 +19,23 @@ target_link_libraries (${qt5debugappender}
   ${Qt5Widgets_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT})
 
-set_target_properties (${qt5debugappender} PROPERTIES
-  VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}"
-  SOVERSION "${log4cplus_soversion}")
+if (ANDROID)
+  # Android does not seem to have SO version support.
+elseif (WIN32)
+  set_target_properties (${qt5debugappender} PROPERTIES
+    VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}")
+else ()
+  set_target_properties (${qt5debugappender} PROPERTIES
+    SOVERSION "${log4cplus_soversion}")
+endif ()
 target_compile_definitions (${qt5debugappender} PRIVATE INSIDE_LOG4CPLUS_QT5DEBUGAPPENDER)
 
+if (APPLE)
+  set_target_properties (${log4cplus} PROPERTIES
+    MACHO_CURRENT_VERSION "${log4cplus_macho_current_version}"
+    MACHO_COMPATIBILITY_VERSION "${log4cplus_macho_compatibility_version}")
+endif ()
+
 qt5_use_modules(${qt5debugappender} Core)
 
 if (WIN32)

diff --git a/scripts/propagate-version.pl b/scripts/propagate-version.pl
@@ -100,4 +100,13 @@ BEGIN
                          /$major$1$minor$2$so_current_adjusted/gx;
         print $line;
     }
+
+    local @ARGV = ("CMakeLists.txt");
+    while (my $line = <>)
+    {
+        $line =~ s/^(\s* set \s* \( \s* log4cplus_soversion \s*) (\d+)/$1$so_current_adjusted/x
+            || $line =~ s/^(\s* set \s* \( \s* log4cplus_macho_current_version \s*) (\d+(?:\.\d+)+)/$1$so_current.0.0/x
+            || $line =~ s/^(\s* set \s* \( \s* log4cplus_macho_compatibility_version \s*) (\d+(?:\.\d+)+)/$1$so_current_adjusted.0.0/x;
+        print $line;
+    }
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -111,12 +111,19 @@ target_link_libraries (${log4cplus} ${log4cplus_LIBS})
 
 if (ANDROID)
   # Android does not seem to have SO version support.
-  target_compile_definitions (${log4cplus} PRIVATE INSIDE_LOG4CPLUS)
+elseif (WIN32)
+  set_target_properties (${log4cplus} PROPERTIES
+    VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}")
 else ()
   set_target_properties (${log4cplus} PROPERTIES
-    VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}"
     SOVERSION "${log4cplus_soversion}")
-  target_compile_definitions (${log4cplus} PRIVATE INSIDE_LOG4CPLUS)
+endif ()
+target_compile_definitions (${log4cplus} PRIVATE INSIDE_LOG4CPLUS)
+
+if (APPLE)
+  set_target_properties (${log4cplus} PROPERTIES
+    MACHO_CURRENT_VERSION "${log4cplus_macho_current_version}"
+    MACHO_COMPATIBILITY_VERSION "${log4cplus_macho_compatibility_version}")
 endif ()
 
 if (MINGW AND LOG4CPLUS_MINGW_STATIC_RUNTIME)