Merge janbar#15

enginelesscc · Jan 21, 2022 · 2cf841e · 2cf841e
1 parent db6bf09
commit 2cf841e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,6 +30,7 @@ cmake_minimum_required( VERSION 3.1.0 )
 
 set( CMAKE_DISABLE_SOURCE_CHANGES ON )
 set( CMAKE_DISABLE_IN_SOURCE_BUILD ON )
+option( OPENSSL_BUILD_WITH_INSTALL_NAMES "Build libraries with unadorned names" OFF )
 
 set( CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" )
 

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
@@ -308,6 +308,10 @@ if( MSVC )
   endif()
 endif()
 
+if (OPENSSL_BUILD_WITH_INSTALL_NAMES)
+   set_target_properties( crypto PROPERTIES OUTPUT_NAME "crypto" )
+endif()
+
 install( TARGETS crypto
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib

diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
@@ -64,6 +64,10 @@ if( MSVC )
   endif()
 endif()
 
+if (OPENSSL_BUILD_WITH_INSTALL_NAMES)
+   set_target_properties( ssl PROPERTIES OUTPUT_NAME "ssl" )
+endif()
+
 install( TARGETS ssl
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib