diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-16 17:19:08 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-16 17:19:08 +0200 |
| commit | 6caf8a4575611bedd5ab6c4d2bc523ffca4546f1 (patch) | |
| tree | 3a1f892faf4a31ff2bd0f89421ec8cb2c7a54e89 | |
| parent | 18ade97fa63fad4d456f29429218105bfc34dd80 (diff) | |
| parent | eeefd84950ac33496fcfe81e0884e67e80243408 (diff) | |
merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUE
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/cmake/FMOD.cmake | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index bcf714b29a..983d388a30 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -173,6 +173,7 @@ Boroondas Gupte VWR-233 VWR-20583 VWR-20891 + VWR-23455 WEB-262 Bulli Schumann CT-218 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) |