summaryrefslogtreecommitdiff
path: root/indra/cmake/FMOD.cmake
diff options
context:
space:
mode:
authorWolfpup Lowenhar <wolfpup67@earthlink.net>2010-10-22 22:22:54 -0400
committerWolfpup Lowenhar <wolfpup67@earthlink.net>2010-10-22 22:22:54 -0400
commitb82220aefcc1f3ae9e1a3f32d0c8a930c5def152 (patch)
treeb8dbb352f0006c1223292c76f47e6c5550e417f4 /indra/cmake/FMOD.cmake
parent830a52521dbf92e029d60dfc82d3869b11bce61a (diff)
parentde6f7e19c44d267d3224c56941c2ab27677c406f (diff)
Merge from Viewer-development
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 96434e38fa..dcf44cd642 100644
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -7,8 +7,10 @@ if (FMOD)
set(FMOD_FIND_REQUIRED ON)
include(FindFMOD)
else (STANDALONE)
- include(Prebuilt)
- use_prebuilt_binary(fmod)
+ if (INSTALL_PROPRIETARY)
+ include(Prebuilt)
+ use_prebuilt_binary(fmod)
+ endif (INSTALL_PROPRIETARY)
if (WINDOWS)
set(FMOD_LIBRARY fmod)