diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-25 16:10:35 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-25 16:10:35 -0400 |
| commit | 066986a09ee2f1c046023619242385eda345d9b5 (patch) | |
| tree | a3c30313c870cdf669f9b22169a4981187625287 /indra/cmake | |
| parent | 6368f6f84958c8c3c2e48c9f47ec98c7e35308c7 (diff) | |
| parent | 1a53efe23335c3a92ce1c279d7487fb979141211 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/FMOD.cmake | 6 |
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) |