summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-16 17:19:08 +0200
committerBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-16 17:19:08 +0200
commit6caf8a4575611bedd5ab6c4d2bc523ffca4546f1 (patch)
tree3a1f892faf4a31ff2bd0f89421ec8cb2c7a54e89 /indra
parent18ade97fa63fad4d456f29429218105bfc34dd80 (diff)
parenteeefd84950ac33496fcfe81e0884e67e80243408 (diff)
merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUE
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/FMOD.cmake6
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)