diff options
| author | Aura Linden <aura@lindenlab.com> | 2013-02-15 17:05:01 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2013-02-15 17:05:01 -0800 |
| commit | 669d1295a3c5745db566f40d12f3de19445131df (patch) | |
| tree | 81d7ceeeb8c27f6fe154204bb7598c292373f24e /indra/cmake | |
| parent | 973e39608ac8d12a2ee70a69ea8eb14e1bfc7b5f (diff) | |
Added ca-bundle.crt behaviors for Mac and Windows.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index c32e357da3..553357f675 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -20,6 +20,7 @@ if(WINDOWS) set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files SLVoice.exe + ca-bundle.crt libsndfile-1.dll vivoxplatform.dll vivoxsdk.dll @@ -196,6 +197,7 @@ elseif(DARWIN) set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files SLVoice + ca-bundle.crt libsndfile.dylib libvivoxoal.dylib libortp.dylib @@ -240,6 +242,7 @@ elseif(LINUX) libvivoxplatform.so libvivoxsdk.so SLVoice + # ca-bundle.crt #No cert for linux. It is actually still 3.2SDK. ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables # or ARCH_PREBUILT_DIRS |