diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-04-07 14:01:34 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-04-07 14:01:34 -0400 |
| commit | 30eb6d13f56534695076b2f159ea93569af6d14c (patch) | |
| tree | 32f8bee0ed3603a64454fd4be7b2ff331e120324 /indra/cmake | |
| parent | 50d1ca325f2acc6e803f5385c9c58d7cd9314b3e (diff) | |
Linux/Mac: Update to latest OpenSSL 1.0.1e build. Fix manifest for
openssl on Mac (copy, deploy). Revert Linux manifest work which tried
to work around 0555 permissions on .sos (and didn't work).
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 59564c2c1b..f2fbc8c775 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -206,6 +206,10 @@ elseif(DARWIN) ) set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(debug_files + libcrypto.dylib + libcrypto.1.0.0.dylib + libssl.dylib + libssl.1.0.0.dylib ) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files @@ -213,15 +217,19 @@ elseif(DARWIN) libapr-1.dylib libaprutil-1.0.dylib libaprutil-1.dylib + libcollada14dom.dylib + libcrypto.dylib + libcrypto.1.0.0.dylib + libexception_handler.dylib libexpat.1.5.2.dylib libexpat.dylib libGLOD.dylib + libhunspell-1.3.0.dylib libllqtwebkit.dylib libminizip.a libndofdev.dylib - libhunspell-1.3.0.dylib - libexception_handler.dylib - libcollada14dom.dylib + libssl.dylib + libssl.1.0.0.dylib ) if (FMODEX) |