diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 22:58:05 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 22:58:05 +0000 |
| commit | 42415ab0cf05cbb1c470ae65a2ab7bed005927dd (patch) | |
| tree | 7bed99ca0b8131d067ed0dea01723f6cb7f2456d /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | 75cf90723f63d1d80b2a3b4b8aa9536cadcda8cb (diff) | |
| parent | 6b2e40157b1f103b8394aeffcce2115321943ebf (diff) | |
Merged in DV546-merge-6.4.24 (pull request #731)
DRTVWR-546 merge up to v 6.4.24
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 75601ddfcb..1c56f49486 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -56,14 +56,21 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll - ssleay32.dll - libeay32.dll nghttp2.dll glod.dll libhunspell.dll uriparser.dll ) + # OpenSSL + if(ADDRESS_SIZE EQUAL 64) + set(release_files ${release_files} libcrypto-1_1-x64.dll) + set(release_files ${release_files} libssl-1_1-x64.dll) + else(ADDRESS_SIZE EQUAL 64) + set(release_files ${release_files} libcrypto-1_1.dll) + set(release_files ${release_files} libssl-1_1.dll) + endif(ADDRESS_SIZE EQUAL 64) + # Filenames are different for 32/64 bit BugSplat file and we don't # have any control over them so need to branch. if (USE_BUGSPLAT) @@ -160,7 +167,6 @@ elseif(DARWIN) libapr-1.dylib libaprutil-1.0.dylib libaprutil-1.dylib - libexception_handler.dylib ${EXPAT_COPY} libGLOD.dylib libhunspell-1.3.0.dylib |