mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-06 21:59:54 -06:00
FindOpenSSL: Update layout for Shining Light Productions 32-bit package
Issue: #25856
This commit is contained in:
committed by
Brad King
parent
a4774b0c10
commit
aa86f487c2
@@ -310,8 +310,10 @@ if(WIN32 AND NOT CYGWIN)
|
|||||||
# Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib
|
# Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib
|
||||||
if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" )
|
if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" )
|
||||||
set(_OPENSSL_MSVC_ARCH_SUFFIX "64")
|
set(_OPENSSL_MSVC_ARCH_SUFFIX "64")
|
||||||
|
set(_OPENSSL_MSVC_FOLDER_SUFFIX "64")
|
||||||
else()
|
else()
|
||||||
set(_OPENSSL_MSVC_ARCH_SUFFIX "32")
|
set(_OPENSSL_MSVC_ARCH_SUFFIX "32")
|
||||||
|
set(_OPENSSL_MSVC_FOLDER_SUFFIX "86")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(OPENSSL_USE_STATIC_LIBS)
|
if(OPENSSL_USE_STATIC_LIBS)
|
||||||
@@ -319,13 +321,13 @@ if(WIN32 AND NOT CYGWIN)
|
|||||||
"_static"
|
"_static"
|
||||||
)
|
)
|
||||||
set(_OPENSSL_PATH_SUFFIXES_DEBUG
|
set(_OPENSSL_PATH_SUFFIXES_DEBUG
|
||||||
"lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
|
"lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
|
||||||
"lib/VC/static"
|
"lib/VC/static"
|
||||||
"VC/static"
|
"VC/static"
|
||||||
"lib"
|
"lib"
|
||||||
)
|
)
|
||||||
set(_OPENSSL_PATH_SUFFIXES_RELEASE
|
set(_OPENSSL_PATH_SUFFIXES_RELEASE
|
||||||
"lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
|
"lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
|
||||||
"lib/VC/static"
|
"lib/VC/static"
|
||||||
"VC/static"
|
"VC/static"
|
||||||
"lib"
|
"lib"
|
||||||
@@ -335,13 +337,13 @@ if(WIN32 AND NOT CYGWIN)
|
|||||||
""
|
""
|
||||||
)
|
)
|
||||||
set(_OPENSSL_PATH_SUFFIXES_DEBUG
|
set(_OPENSSL_PATH_SUFFIXES_DEBUG
|
||||||
"lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
|
"lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
|
||||||
"lib/VC"
|
"lib/VC"
|
||||||
"VC"
|
"VC"
|
||||||
"lib"
|
"lib"
|
||||||
)
|
)
|
||||||
set(_OPENSSL_PATH_SUFFIXES_RELEASE
|
set(_OPENSSL_PATH_SUFFIXES_RELEASE
|
||||||
"lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
|
"lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
|
||||||
"lib/VC"
|
"lib/VC"
|
||||||
"VC"
|
"VC"
|
||||||
"lib"
|
"lib"
|
||||||
|
|||||||
Reference in New Issue
Block a user