From 415eb81ec3e3c2425668db7abde9153228d9f1de Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Wed, 2 Oct 2024 04:41:23 +0200 Subject: [PATCH 1/2] Revert "bump minimum CMake version for DLL_NAME_WITH_SOVERSION" This reverts commit 5feccf86658d09b917c005bfb43191dd38f38c83. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f05c3bad4..62caadcf6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.27) +cmake_minimum_required (VERSION 3.16.4) if(MSVC) cmake_policy(SET CMP0091 NEW) endif() From 6a20a5841cb70424c2ebfa936047ef6ea3567b52 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Wed, 2 Oct 2024 04:44:37 +0200 Subject: [PATCH 2/2] Only use DLL_NAME_WITH_SOVERSION for cmake >= 3.27 Suggested by Viktor Szakats in #1084 --- crypto/CMakeLists.txt | 4 +++- ssl/CMakeLists.txt | 4 +++- tls/CMakeLists.txt | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index c4f1af5906..59939cbe67 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -850,7 +850,9 @@ set_target_properties(crypto PROPERTIES EXPORT_NAME Crypto VERSION ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION} - DLL_NAME_WITH_SOVERSION TRUE + if(NOT CMAKE_VERSION VERSION_LESS 3.27.0) + DLL_NAME_WITH_SOVERSION TRUE + endif() ) target_include_directories( diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 414fe077db..f5288a963e 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -92,7 +92,9 @@ set_target_properties(ssl PROPERTIES EXPORT_NAME SSL VERSION ${SSL_VERSION} SOVERSION ${SSL_MAJOR_VERSION} - DLL_NAME_WITH_SOVERSION TRUE + if(NOT CMAKE_VERSION VERSION_LESS 3.27.0) + DLL_NAME_WITH_SOVERSION TRUE + endif() ) target_include_directories( diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index e584dcbdee..406fe125dc 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt @@ -64,7 +64,9 @@ set_target_properties(tls PROPERTIES EXPORT_NAME TLS VERSION ${TLS_VERSION} SOVERSION ${TLS_MAJOR_VERSION} - DLL_NAME_WITH_SOVERSION TRUE + if(NOT CMAKE_VERSION VERSION_LESS 3.27.0) + DLL_NAME_WITH_SOVERSION TRUE + endif() ) target_include_directories(