From 791d4fd350878f4aba7676b39195db75ae130d3a Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 20 Jul 2023 12:15:45 -0400 Subject: 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 --- Modules/FindOpenSSL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v0.12