diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-18 15:25:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-18 15:25:09 -0700 |
| commit | aa700f794ed05e143eb9cc16cb6dddfb56062842 (patch) | |
| tree | 4d69fe2e4b9f9f3ee5c3ba3d75762a5de800f640 | |
| parent | 9820c8f57e5bca25143c1e5a1123eba59cb82a04 (diff) | |
| parent | 6caf8a4575611bedd5ab6c4d2bc523ffca4546f1 (diff) | |
STORM-406 : fmod build issue, merge Boroondas change
| -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) |