diff options
| author | Kyle Ambroff <ambroff@lindenlab.com> | 2010-10-25 11:27:29 -0700 |
|---|---|---|
| committer | Kyle Ambroff <ambroff@lindenlab.com> | 2010-10-25 11:27:29 -0700 |
| commit | 4b49b0eff79c41060ba53d0d33ff83b4c18e277b (patch) | |
| tree | ae40206e0922d03346399ea2fe89a7f0327bc22b /indra/cmake | |
| parent | 7be4f43d1704a5d5318e4fd32ab95a132cd26ea3 (diff) | |
| parent | de6f7e19c44d267d3224c56941c2ab27677c406f (diff) | |
Merge with lindenlab/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) |