From d53613b5ae7fd14da79b90b9fc65fa9938e331af Mon Sep 17 00:00:00 2001
From: Boroondas Gupte <hg@boroon.dasgupta.ch>
Date: Sat, 16 Oct 2010 17:11:47 +0200
Subject: [PATCH] VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is
TRUE
---
doc/contributions.txt | 1 +
indra/cmake/FMOD.cmake | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index d8dec692698..d7fdba0d3cb 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -172,6 +172,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 4582017bcbe..fd9d5fe1979 100755
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -1,5 +1,7 @@
# -*- cmake -*-
-include(Prebuilt)
+if (INSTALL_PROPRIETARY)
+ include(Prebuilt)
+endif (INSTALL_PROPRIETARY)
set(FMOD_FIND_QUIETLY OFF)
set(FMOD_FIND_REQUIRED OFF)
@@ -7,7 +9,9 @@ set(FMOD_FIND_REQUIRED OFF)
if (STANDALONE)
include(FindFMOD)
else (STANDALONE)
- use_prebuilt_binary(fmod)
+ if (INSTALL_PROPRIETARY)
+ use_prebuilt_binary(fmod)
+ endif (INSTALL_PROPRIETARY)
if (WINDOWS)
set(FMOD_LIBRARY fmod)
--
GitLab