浏览代码

Merge topic 'FindOpenSSL-trust-root-dir' into release-3.27

791d4fd350 FindOpenSSL: Prefer OPENSSL_ROOT_DIR only if non-empty

Acked-by: Kitware Robot <[email protected]>
Merge-request: !8643
Brad King 2 年之前
父节点
当前提交
3ea7204de4
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      Modules/FindOpenSSL.cmake

+ 1 - 1
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)