From 60081d7ed5d699eb97027c48e7431481473bcde2 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 16 Feb 2012 13:22:55 +0100
Subject: [PATCH] Melanie's fix of FMOD on OS X

---
 indra/cmake/FMOD.cmake       | 19 +++----------------
 indra/cmake/FMODEX.cmake     | 19 +++----------------
 indra/newview/CMakeLists.txt | 16 ++++++++++------
 3 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
index df9b5b18e..a2d9245ff 100644
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -7,26 +7,13 @@ if(INSTALL_PROPRIETARY)
   use_prebuilt_binary(fmod)
 endif(INSTALL_PROPRIETARY)
 
-find_library(FMOD_LIBRARY_RELEASE
+find_library(FMOD_LIBRARY
              NAMES fmod fmodvc fmod-3.75
              PATHS
-             ${ARCH_PREBUILT_DIRS_RELEASE}
+             optimized ${ARCH_PREBUILT_DIRS_RELEASE}
+             debug ${ARCH_PREBUILT_DIRS_DEBUG}
              )
 
-find_library(FMOD_LIBRARY_DEBUG
-             NAMES fmod fmodvc fmod-3.75
-             PATHS
-             ${ARCH_PREBUILT_DIRS_DEBUG}
-             )
-
-if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
-  set(FMOD_LIBRARY
-      debug ${FMOD_LIBRARY_DEBUG}
-      optimized ${FMOD_LIBRARY_RELEASE})
-elseif (FMOD_LIBRARY_RELEASE)
-  set(FMOD_LIBRARY ${FMOD_LIBRARY_RELEASE})
-endif (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
-
 if (NOT FMOD_LIBRARY)
   set(FMOD_SDK_DIR CACHE PATH "Path to the FMOD SDK.")
   if (FMOD_SDK_DIR)
diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake
index 934b74b24..bf74341fe 100644
--- a/indra/cmake/FMODEX.cmake
+++ b/indra/cmake/FMODEX.cmake
@@ -7,26 +7,13 @@ if(INSTALL_PROPRIETARY)
   use_prebuilt_binary(fmodex)
 endif(INSTALL_PROPRIETARY)
 
-find_library(FMODEX_LIBRARY_RELEASE
+find_library(FMODEX_LIBRARY
              NAMES fmodex fmodex_vc fmodexL_vc
              PATHS
-             ${ARCH_PREBUILT_DIRS_RELEASE}
+             optimized ${ARCH_PREBUILT_DIRS_RELEASE}
+             debug ${ARCH_PREBUILT_DIRS_DEBUG}
              )
 
-find_library(FMODEX_LIBRARY_DEBUG
-             NAMES fmodex fmodex_vc fmodexL_vc
-             PATHS
-             ${ARCH_PREBUILT_DIRS_DEBUG}
-             )
-
-if (FMODEX_LIBRARY_RELEASE AND FMODEX_LIBRARY_DEBUG)
-  set(FMODEX_LIBRARY
-      debug ${FMODEX_LIBRARY_DEBUG}
-      optimized ${FMODEX_LIBRARY_RELEASE})
-elseif (FMODEX_LIBRARY_RELEASE)
-  set(FMODEX_LIBRARY ${FMODEX_LIBRARY_RELEASE})
-endif (FMODEX_LIBRARY_RELEASE AND FMODEX_LIBRARY_DEBUG)
-
 if (NOT FMODEX_LIBRARY)
   set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
   if (FMODEX_SDK_DIR)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e723246f4..0f9fb6daa 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1349,12 +1349,16 @@ if (FMOD OR FMODEX)
   if (NOT WINDOWS)
     set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
     add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
-	if(FMODEX)
-		set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY})
-	endif(FMODEX)
-	if(FMOD)
-		set(fmodwrapper_needed_LIBRARIES "${fmodwrapper_needed_LIBRARIES} ${FMOD_LIBRARY}")
-	endif(FMOD)
+    if(FMOD AND FMODEX)
+		set(fmodwrapper_needed_LIBRARIES "${FMODEX_LIBRARY} ${FMOD_LIBRARY}")
+    else(FMOD AND FMODEX)
+        if(FMODEX)
+            set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY})
+        endif(FMODEX)
+        if(FMOD)
+            set(fmodwrapper_needed_LIBRARIES "${FMOD_LIBRARY}")
+        endif(FMOD)
+    endif(FMOD AND FMODEX)
     if (DARWIN)
       list(APPEND fmodwrapper_needed_LIBRARIES ${CARBON_LIBRARY})
       set_target_properties(