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: VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUE

---
 indra/cmake/FMOD.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
index 4582017bcb..fd9d5fe197 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)
-- 
cgit v1.2.3


From ec0f2b831eab0694e333f8defb795a986f921a55 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 18 Oct 2010 15:33:08 -0700
Subject: STORM-406: Fix for fmod inclusion in llaudio cmake

---
 indra/llaudio/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index e869b9717c..21ec622819 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -14,7 +14,6 @@ include(LLVFS)
 
 include_directories(
     ${LLAUDIO_INCLUDE_DIRS}
-    ${FMOD_INCLUDE_DIR}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
@@ -45,6 +44,10 @@ set(llaudio_HEADER_FILES
     )
 
 if (FMOD)
+    include_directories(
+        ${FMOD_INCLUDE_DIR}
+        )
+
     list(APPEND llaudio_SOURCE_FILES
          llaudioengine_fmod.cpp
          lllistener_fmod.cpp
-- 
cgit v1.2.3