diff options
| author | Brad King <brad.king@kitware.com> | 2023-07-21 13:37:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-07-21 13:37:28 (GMT) |
| commit | 3ea7204de47d78b1aa8ee3cddfa59d034fc601d8 (patch) | |
| tree | 9cb1a80deb7c1256c9faf935eb92c84a0ead3343 | |
| parent | 50c972346291399df4292e1cdbbf03d928e6d96e (diff) | |
| parent | 791d4fd350878f4aba7676b39195db75ae130d3a (diff) | |
| download | CMake-3ea7204de47d78b1aa8ee3cddfa59d034fc601d8.zip CMake-3ea7204de47d78b1aa8ee3cddfa59d034fc601d8.tar.gz CMake-3ea7204de47d78b1aa8ee3cddfa59d034fc601d8.tar.bz2 | |
Merge topic 'FindOpenSSL-trust-root-dir' into release-3.27
791d4fd350 FindOpenSSL: Prefer OPENSSL_ROOT_DIR only if non-empty
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8643
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 426d00d..10282a0 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -230,7 +230,7 @@ else() set(_OPENSSL_FIND_PATH_SUFFIX "include") endif() -if ((DEFINED OPENSSL_ROOT_DIR) OR (DEFINED ENV{OPENSSL_ROOT_DIR})) +if (OPENSSL_ROOT_DIR OR NOT "$ENV{OPENSSL_ROOT_DIR}" STREQUAL "") set(_OPENSSL_ROOT_HINTS HINTS ${OPENSSL_ROOT_DIR} ENV OPENSSL_ROOT_DIR) set(_OPENSSL_ROOT_PATHS NO_DEFAULT_PATH) elseif (MSVC) |