dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-05 07:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

FindOpenSSL: Update layout for Shining Light Productions package on Windows

Browse Source 
Fixes: #25702
This commit is contained in:
Matthias Isele
2024-02-23 07:43:59 -05:00
committed by Brad King
parent 9cd34156f4
commit 1327e0ff75
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Modules/FindOpenSSL.cmake
View File

@@ -318,7 +318,14 @@ if(WIN32 AND NOT CYGWIN)
set(_OPENSSL_STATIC_SUFFIX set(_OPENSSL_STATIC_SUFFIX
"_static" "_static"
) )
set(_OPENSSL_PATH_SUFFIXES set(_OPENSSL_PATH_SUFFIXES_DEBUG
"lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
"lib/VC/static"
"VC/static"
"lib"
)
set(_OPENSSL_PATH_SUFFIXES_RELEASE
"lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
"lib/VC/static" "lib/VC/static"
"VC/static" "VC/static"
"lib" "lib"
@@ -327,7 +334,14 @@ if(WIN32 AND NOT CYGWIN)
set(_OPENSSL_STATIC_SUFFIX set(_OPENSSL_STATIC_SUFFIX
"" ""
) )
set(_OPENSSL_PATH_SUFFIXES set(_OPENSSL_PATH_SUFFIXES_DEBUG
"lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
"lib/VC"
"VC"
"lib"
)
set(_OPENSSL_PATH_SUFFIXES_RELEASE
"lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
"lib/VC" "lib/VC"
"VC" "VC"
"lib" "lib"
@@ -356,7 +370,7 @@ if(WIN32 AND NOT CYGWIN)
NAMES_PER_DIR NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES} ${_OPENSSL_PATH_SUFFIXES_DEBUG}
) )
find_library(LIB_EAY_RELEASE find_library(LIB_EAY_RELEASE
@@ -381,7 +395,7 @@ if(WIN32 AND NOT CYGWIN)
NAMES_PER_DIR NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES} ${_OPENSSL_PATH_SUFFIXES_RELEASE}
) )
find_library(SSL_EAY_DEBUG find_library(SSL_EAY_DEBUG
@@ -406,7 +420,7 @@ if(WIN32 AND NOT CYGWIN)
NAMES_PER_DIR NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES} ${_OPENSSL_PATH_SUFFIXES_DEBUG}
) )
find_library(SSL_EAY_RELEASE find_library(SSL_EAY_RELEASE
@@ -431,7 +445,7 @@ if(WIN32 AND NOT CYGWIN)
NAMES_PER_DIR NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES} ${_OPENSSL_PATH_SUFFIXES_RELEASE}
) )
set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}") set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")