summaryrefslogtreecommitdiff
path: root/indra/cmake/FMOD.cmake
diff options
context:
space:
mode:
authorJennifer Leech <jenn@lindenlab.com>2008-06-26 19:08:51 +0000
committerJennifer Leech <jenn@lindenlab.com>2008-06-26 19:08:51 +0000
commitd32c8825b63ca8dc9f1571aefea01cc89eba36e6 (patch)
tree6f888fc1110cc63b7ba46a5823eb8befd9419964 /indra/cmake/FMOD.cmake
parent68edae3f801f633037cf5cee063f65abe081c912 (diff)
svn merge -r89701:90677 svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release
Diffstat (limited to 'indra/cmake/FMOD.cmake')
-rw-r--r--indra/cmake/FMOD.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
index 258fd6bf66..fddf6447ea 100644
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -1,7 +1,9 @@
# -*- cmake -*-
-include(Prebuilt)
-use_prebuilt_binary(fmod)
+if(INSTALL_PROPRIETARY)
+ include(Prebuilt)
+ use_prebuilt_binary(fmod)
+endif(INSTALL_PROPRIETARY)
find_library(FMOD_LIBRARY
NAMES fmod fmodvc fmod-3.75