diff options
| author | Jennifer Leech <jenn@lindenlab.com> | 2008-06-26 19:08:51 +0000 |
|---|---|---|
| committer | Jennifer Leech <jenn@lindenlab.com> | 2008-06-26 19:08:51 +0000 |
| commit | d32c8825b63ca8dc9f1571aefea01cc89eba36e6 (patch) | |
| tree | 6f888fc1110cc63b7ba46a5823eb8befd9419964 /indra/cmake/ViewerMiscLibs.cmake | |
| parent | 68edae3f801f633037cf5cee063f65abe081c912 (diff) | |
svn merge -r89701:90677 svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release
Diffstat (limited to 'indra/cmake/ViewerMiscLibs.cmake')
| -rw-r--r-- | indra/cmake/ViewerMiscLibs.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 7329972596..1665dd50f1 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -4,6 +4,8 @@ include(Prebuilt) if (NOT STANDALONE) use_prebuilt_binary(libstdc++) use_prebuilt_binary(libuuid) - use_prebuilt_binary(vivox) + if(INSTALL_PROPRIETARY) + use_prebuilt_binary(vivox) + endif(INSTALL_PROPRIETARY) endif(NOT STANDALONE) |