Эх сурвалжийг харах

Merge pull request #9302 from liamwhite/why-are-we-still-using-ado

externals: always use LibreSSL on Windows
bunnei 3 жил өмнө
parent
commit
2572b0a5ea

+ 8 - 4
externals/CMakeLists.txt

@@ -92,10 +92,14 @@ endif()
 add_subdirectory(sirit)
 add_subdirectory(sirit)
 
 
 if (ENABLE_WEB_SERVICE)
 if (ENABLE_WEB_SERVICE)
-    find_package(OpenSSL 1.1)
-    if (OPENSSL_FOUND)
-        set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
-    else()
+    if (NOT WIN32)
+        find_package(OpenSSL 1.1)
+        if (OPENSSL_FOUND)
+            set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
+        endif()
+    endif()
+
+    if (WIN32 OR NOT OPENSSL_FOUND)
         # LibreSSL
         # LibreSSL
         set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
         set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
         set(OPENSSLDIR "/etc/ssl/")
         set(OPENSSLDIR "/etc/ssl/")