diff options
| author | Brad King <brad.king@kitware.com> | 2023-04-06 13:09:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-04-06 13:09:42 (GMT) |
| commit | 3f68cb080fdd9cbd1e037f039c4a2143ef4950e3 (patch) | |
| tree | 3e06fc64642453e6048e3ff401c87a5c90b875ea | |
| parent | 21648032407a54c3f632e86e1ec7274cabd75e90 (diff) | |
| parent | 248689f9bf6787fce8596ddfbd9f0e3119999ee9 (diff) | |
| download | CMake-3f68cb080fdd9cbd1e037f039c4a2143ef4950e3.zip CMake-3f68cb080fdd9cbd1e037f039c4a2143ef4950e3.tar.gz CMake-3f68cb080fdd9cbd1e037f039c4a2143ef4950e3.tar.bz2 | |
Merge topic 'FindOpenSSL-mingw'
248689f9bf FindOpenSSL: Fix finding header files and static libraries on MinGW
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8394
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 4e8374c..45dc9ac 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -210,7 +210,7 @@ endif () # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES if(OPENSSL_USE_STATIC_LIBS) set(_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - if(WIN32) + if(MSVC) set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) else() set(CMAKE_FIND_LIBRARY_SUFFIXES .a ) @@ -230,7 +230,7 @@ else() set(_OPENSSL_FIND_PATH_SUFFIX "include") endif() -if (WIN32) +if (MSVC) # http://www.slproweb.com/products/Win32OpenSSL.html set(_OPENSSL_ROOT_HINTS ${OPENSSL_ROOT_DIR} |