diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:32 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:32 +0300 |
commit | d734105446182b17a91f6590eaa23ac690032817 (patch) | |
tree | cce54f1d1347c63100d9edef2fe942bab2f51b5e /indra/cmake/OpenSSL.cmake | |
parent | 2f5d44f4b6e029be0593fe46151f8d25c4fa11d3 (diff) | |
parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) |
Merge branch 'master' into DRTVWR-486
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
Diffstat (limited to 'indra/cmake/OpenSSL.cmake')
-rw-r--r-- | indra/cmake/OpenSSL.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index eb548bdcc1..32400f5e4e 100644 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake @@ -9,7 +9,7 @@ if (USESYSTEMLIBS) else (USESYSTEMLIBS) use_prebuilt_binary(openssl) if (WINDOWS) - set(OPENSSL_LIBRARIES ssleay32 libeay32) + set(OPENSSL_LIBRARIES libssl libcrypto) else (WINDOWS) set(OPENSSL_LIBRARIES ssl crypto) endif (WINDOWS) |