merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUE

2010-10-16 17:19:08 +02:00 · 2010-10-16 17:19:08 +02:00 · 6caf8a4575
parent 18ade97fa6 eeefd84950
commit 6caf8a4575
2 changed files with 5 additions and 2 deletions
--- 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
--- 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)