From 76a08a78847b74a13795ffdcf64417de3fa0ec52 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Thu, 31 Jul 2008 17:21:46 +0000
Subject: DEV-18513 - Don't fail if we have no debug FMOD libraries Reviewed by
 Poppy.

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

diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
index f90dc52681..759b8f1340 100644
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -1,5 +1,7 @@
 # -*- cmake -*-
 
+include(Linking)
+
 if(INSTALL_PROPRIETARY)
   include(Prebuilt)
   use_prebuilt_binary(fmod)
@@ -9,22 +11,21 @@ find_library(FMOD_LIBRARY_RELEASE
              NAMES fmod fmodvc fmod-3.75
              PATHS
              ${ARCH_PREBUILT_DIRS_RELEASE}
-             ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release
-             ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release
-             ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client
              )
 
 find_library(FMOD_LIBRARY_DEBUG
              NAMES fmod fmodvc fmod-3.75
              PATHS
              ${ARCH_PREBUILT_DIRS_DEBUG}
-             ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug
-             ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_debug
              )
 
-if(FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
-  set(FMOD_LIBRARY debug ${FMOD_LIBRARY_DEBUG} optimized ${FMOD_LIBRARY_RELEASE})
-endif(FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_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.")
-- 
cgit v1.2.3