From eb3de8543e5580cb353230577f9f6606e71002f2 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 24 Feb 2011 20:57:34 -0800
Subject: STORM-1023 (was OPEN-4) and STORM-1022 (was OPEN-24) : fmod and kdu
 changes : cmake changes making possible to use Findxxx when
 INSTALL_PROPRIETARY is OFF and STANDALONE is OFF too, simplify cmake scripts
 around INSTALL_PROPRIETARY, add fmodex to FindFMOD

---
 indra/cmake/FMOD.cmake | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'indra/cmake/FMOD.cmake')

diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
index dcf44cd642..6a4322df9b 100644
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -1,17 +1,23 @@
 # -*- cmake -*-
 
-set(FMOD ON CACHE BOOL "Use FMOD sound library.")
+# FMOD can be set when launching the make using the argument -DFMOD:BOOL=ON
+# When building using proprietary binaries though (i.e. having access to LL private servers),
+# we always build with FMOD.
+# Open source devs should use the -DFMOD:BOOL=ON then if they want to build with FMOD, whether
+# they are using STANDALONE or not.
+if (INSTALL_PROPRIETARY)
+  set(FMOD ON CACHE BOOL "Use FMOD sound library.")
+endif (INSTALL_PROPRIETARY)
 
 if (FMOD)
-  if (STANDALONE)
+  if (NOT INSTALL_PROPRIETARY)
+    # This cover the STANDALONE case and the NOT STANDALONE but not using proprietary libraries
+	# This should then be invoke by all open source devs outside LL
     set(FMOD_FIND_REQUIRED ON)
     include(FindFMOD)
-  else (STANDALONE)
-    if (INSTALL_PROPRIETARY)
-      include(Prebuilt)
-      use_prebuilt_binary(fmod)
-    endif (INSTALL_PROPRIETARY)
-    
+  else (NOT INSTALL_PROPRIETARY)
+	include(Prebuilt)
+	use_prebuilt_binary(fmod)    
     if (WINDOWS)
       set(FMOD_LIBRARY fmod)
     elseif (DARWIN)
@@ -19,8 +25,7 @@ if (FMOD)
     elseif (LINUX)
       set(FMOD_LIBRARY fmod-3.75)
     endif (WINDOWS)
-
     SET(FMOD_LIBRARIES ${FMOD_LIBRARY})
     set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-  endif (STANDALONE)
+  endif (NOT INSTALL_PROPRIETARY)
 endif (FMOD)
-- 
cgit v1.2.3


From 4745d124c8d8b4725d8313311d9e8e4b9bf172ee Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 4 Mar 2011 22:56:15 -0800
Subject: STORM-1023 : allow non standalone and non install prebuilt to use
 local fmod package path in autobuild.xml

---
 indra/cmake/FMOD.cmake | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 indra/cmake/FMOD.cmake

(limited to 'indra/cmake/FMOD.cmake')

diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
old mode 100644
new mode 100755
index 6a4322df9b..cb5124812d
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -10,22 +10,30 @@ if (INSTALL_PROPRIETARY)
 endif (INSTALL_PROPRIETARY)
 
 if (FMOD)
-  if (NOT INSTALL_PROPRIETARY)
-    # This cover the STANDALONE case and the NOT STANDALONE but not using proprietary libraries
-	# This should then be invoke by all open source devs outside LL
+  if (STANDALONE)
+    # In that case, we use the version of the library installed on the system
     set(FMOD_FIND_REQUIRED ON)
     include(FindFMOD)
-  else (NOT INSTALL_PROPRIETARY)
-	include(Prebuilt)
-	use_prebuilt_binary(fmod)    
-    if (WINDOWS)
-      set(FMOD_LIBRARY fmod)
-    elseif (DARWIN)
-      set(FMOD_LIBRARY fmod)
-    elseif (LINUX)
-      set(FMOD_LIBRARY fmod-3.75)
-    endif (WINDOWS)
-    SET(FMOD_LIBRARIES ${FMOD_LIBRARY})
-    set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-  endif (NOT INSTALL_PROPRIETARY)
+  else (STANDALONE)
+    if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+	  # If the path have been specified in the arguments, use that
+      set(FMOD_LIBRARIES ${FMOD_LIBRARY})
+	  MESSAGE(STATUS "Using FMOD path: ${FMOD_LIBRARIES}, ${FMOD_INCLUDE_DIR}")
+    else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+	  # If not, we're going to try to get the package listed in autobuild.xml
+	  # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL) 
+	  # as accessing the private LL location will fail if you don't have the credential
+	  include(Prebuilt)
+	  use_prebuilt_binary(fmod)    
+      if (WINDOWS)
+        set(FMOD_LIBRARY fmod)
+      elseif (DARWIN)
+        set(FMOD_LIBRARY fmod)
+      elseif (LINUX)
+        set(FMOD_LIBRARY fmod-3.75)
+      endif (WINDOWS)
+      set(FMOD_LIBRARIES ${FMOD_LIBRARY})
+      set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+    endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+  endif (STANDALONE)
 endif (FMOD)
-- 
cgit v1.2.3