diff options
| author | Brad King <brad.king@kitware.com> | 2023-07-20 16:15:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-07-20 16:18:13 (GMT) |
| commit | 791d4fd350878f4aba7676b39195db75ae130d3a (patch) | |
| tree | 9d4f6ec62c5a7d32f4b5e4cfe27b92c52da168d2 | |
| parent | 8ea4a99d28dcaf11eef0c3141aa19a43c1dfaa05 (diff) | |
| download | CMake-791d4fd350878f4aba7676b39195db75ae130d3a.zip CMake-791d4fd350878f4aba7676b39195db75ae130d3a.tar.gz CMake-791d4fd350878f4aba7676b39195db75ae130d3a.tar.bz2 | |
FindOpenSSL: Prefer OPENSSL_ROOT_DIR only if non-empty
Since commit 5cc8a69867 (FindOpenSSL: Trust the user's OPENSSL_ROOT_DIR,
2023-05-17, v3.27.0-rc1~71^2) we use `OPENSSL_ROOT_DIR` whenever it is
defined, even if it is an empty string. This breaks a pattern in
existing projects that define an empty `OPENSSL_ROOT_DIR` cache entry so
that `cmake-gui` users can fill it in. Use the value only if non-empty.
Issue: #18352
| -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) |