summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-16 17:18:38 +0200
committerBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-16 17:18:38 +0200
commiteeefd84950ac33496fcfe81e0884e67e80243408 (patch)
treef28f6a4d9255a04f42923d12500697bfc4742e93 /indra
parent54065ab2f9262cac67a5a3d00aed3f6348383bfc (diff)
parentd53613b5ae7fd14da79b90b9fc65fa9938e331af (diff)
merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUE
Diffstat (limited to 'indra')
-rwxr-xr-xindra/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 100755
--- 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)