diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-10-27 14:27:10 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-10-27 14:27:10 -0400 |
| commit | 1aee2f0d4d16548660df4995aaf3c349304962af (patch) | |
| tree | 6a39c4a881013a2e0964c1f5a63567843c79ab89 /indra/cmake | |
| parent | e75fd8beb15fb89e7aba253cac989b242566c512 (diff) | |
| parent | 92959895e2763e51b6ef9fab5a14e0d0930d4f2c (diff) | |
pull from hg.lindenlab.com/viewer-mesh to mesh-development
Note all future commits should happen in public mesh-development. Will
ping internal devs to make sure they transition over.
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) |