|
|
@@ -367,10 +367,10 @@ if(WIN32 AND NOT CYGWIN)
|
|
|
# Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib
|
|
|
if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" )
|
|
|
set(_OPENSSL_MSVC_ARCH_SUFFIX "64")
|
|
|
- set(_OPENSSL_MSVC_FOLDER_SUFFIX "64")
|
|
|
+ set(_OPENSSL_MSVC_FOLDER_SUFFIX "x64")
|
|
|
else()
|
|
|
set(_OPENSSL_MSVC_ARCH_SUFFIX "32")
|
|
|
- set(_OPENSSL_MSVC_FOLDER_SUFFIX "86")
|
|
|
+ set(_OPENSSL_MSVC_FOLDER_SUFFIX "x86")
|
|
|
endif()
|
|
|
|
|
|
if(OPENSSL_USE_STATIC_LIBS)
|
|
|
@@ -378,13 +378,13 @@ if(WIN32 AND NOT CYGWIN)
|
|
|
"_static"
|
|
|
)
|
|
|
set(_OPENSSL_PATH_SUFFIXES_DEBUG
|
|
|
- "lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
|
|
|
+ "lib/VC/${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
|
|
|
"lib/VC/static"
|
|
|
"VC/static"
|
|
|
"lib"
|
|
|
)
|
|
|
set(_OPENSSL_PATH_SUFFIXES_RELEASE
|
|
|
- "lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
|
|
|
+ "lib/VC/${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
|
|
|
"lib/VC/static"
|
|
|
"VC/static"
|
|
|
"lib"
|
|
|
@@ -394,13 +394,13 @@ if(WIN32 AND NOT CYGWIN)
|
|
|
""
|
|
|
)
|
|
|
set(_OPENSSL_PATH_SUFFIXES_DEBUG
|
|
|
- "lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
|
|
|
+ "lib/VC/${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
|
|
|
"lib/VC"
|
|
|
"VC"
|
|
|
"lib"
|
|
|
)
|
|
|
set(_OPENSSL_PATH_SUFFIXES_RELEASE
|
|
|
- "lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
|
|
|
+ "lib/VC/${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
|
|
|
"lib/VC"
|
|
|
"VC"
|
|
|
"lib"
|