Merge topic 'FindOpenSSL-root-dir'

12d6eb63 FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)

Modules/FindOpenSSL.cmake

@@ -59,10 +59,6 @@ if (WIN32)
     "C:/OpenSSL-Win64/"
     )
   unset(_programfiles)
-  set(_OPENSSL_ROOT_HINTS_AND_PATHS
-    HINTS ${_OPENSSL_ROOT_HINTS}
-    PATHS ${_OPENSSL_ROOT_PATHS}
-    )
 else ()
   set(_OPENSSL_ROOT_HINTS
     ${OPENSSL_ROOT_DIR}
@@ -70,6 +66,11 @@ else ()
     )
 endif ()
 
+set(_OPENSSL_ROOT_HINTS_AND_PATHS
+    HINTS ${_OPENSSL_ROOT_HINTS}
+    PATHS ${_OPENSSL_ROOT_PATHS}
+    )
+
 find_path(OPENSSL_INCLUDE_DIR
   NAMES
     openssl/ssl.h