Land #1084, Append version to dll on CMake

5 files changed, 11 insertions, 17 deletions

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 6aca153..c4c7d72 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -50,7 +50,7 @@ jobs:
 
       - name: "Configure CMake"
         shell: cmd
-        run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} DBUILD_SHARED_LIBS=${{ matrix.shared }} -DCMAKE_INSTALL_PREFIX=../local
+        run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -D BUILD_SHARED_LIBS=${{ matrix.shared }} -D CMAKE_INSTALL_PREFIX=../local
 
       - name: "Build"
         shell: cmd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93189f7..7d42334 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.16.4)
+cmake_minimum_required (VERSION 3.27)
 if(MSVC)
         cmake_policy(SET CMP0091 NEW)
 endif()
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index bf5c4a6..c4f1af5 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -844,15 +844,13 @@ add_library(crypto $<TARGET_OBJECTS:crypto_obj> $<TARGET_OBJECTS:compat_obj> emp
 
 export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
 target_link_libraries(crypto ${PLATFORM_LIBS})
-if (WIN32)
-        set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION} PARENT_SCOPE)
-endif()
 set_target_properties(crypto PROPERTIES
-        OUTPUT_NAME crypto${CRYPTO_POSTFIX}
-        ARCHIVE_OUTPUT_NAME crypto${CRYPTO_POSTFIX}
+        OUTPUT_NAME crypto
+        ARCHIVE_OUTPUT_NAME crypto
         EXPORT_NAME Crypto
         VERSION ${CRYPTO_VERSION}
         SOVERSION ${CRYPTO_MAJOR_VERSION}
+        DLL_NAME_WITH_SOVERSION TRUE
 )
 
 target_include_directories(
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 76f4570..414fe07 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -86,15 +86,13 @@ endif()
 
 export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
 target_link_libraries(ssl crypto ${PLATFORM_LIBS})
-if (WIN32)
-        set(SSL_POSTFIX -${SSL_MAJOR_VERSION} PARENT_SCOPE)
-endif()
 set_target_properties(ssl PROPERTIES
-        OUTPUT_NAME ssl${SSL_POSTFIX}
-        ARCHIVE_OUTPUT_NAME ssl${SSL_POSTFIX}
+        OUTPUT_NAME ssl
+        ARCHIVE_OUTPUT_NAME ssl
         EXPORT_NAME SSL
         VERSION ${SSL_VERSION}
         SOVERSION ${SSL_MAJOR_VERSION}
+        DLL_NAME_WITH_SOVERSION TRUE
 )
 
 target_include_directories(
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 919b1fa..e584dcb 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -58,15 +58,13 @@ endif()
 
 export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym)
 target_link_libraries(tls ${OPENSSL_LIBS})
-if (WIN32)
-        set(TLS_POSTFIX -${TLS_MAJOR_VERSION} PARENT_SCOPE)
-endif()
 set_target_properties(tls PROPERTIES
-        OUTPUT_NAME tls${TLS_POSTFIX}
-        ARCHIVE_OUTPUT_NAME tls${TLS_POSTFIX}
+        OUTPUT_NAME tls
+        ARCHIVE_OUTPUT_NAME tls
         EXPORT_NAME TLS
         VERSION ${TLS_VERSION}
         SOVERSION ${TLS_MAJOR_VERSION}
+        DLL_NAME_WITH_SOVERSION TRUE
 )
 
 target_include_directories(