diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake
index 902af05fb..dbac0ebac 100644
--- a/indra/cmake/FMODEX.cmake
+++ b/indra/cmake/FMODEX.cmake
@@ -2,18 +2,6 @@
 
 include(Linking)
 
-if(INSTALL_PROPRIETARY)
-  include(Prebuilt)
-  use_prebuilt_binary(fmodex)
-endif(INSTALL_PROPRIETARY)
-
-find_library(FMODEX_LIBRARY
-             NAMES fmodex fmodexL fmodex_vc fmodexL_vc
-             PATHS
-             optimized ${ARCH_PREBUILT_DIRS_RELEASE}
-             debug ${ARCH_PREBUILT_DIRS_DEBUG}
-             )
-
 if (NOT FMODEX_LIBRARY)
   set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
   if (FMODEX_SDK_DIR)
@@ -21,19 +9,19 @@ if (NOT FMODEX_LIBRARY)
       find_library(FMODEX_LIBRARY
                    fmodex_vc fmodexL_vc fmodex fmodexL
                    PATHS
-                   ${FMODEX_SDK_DIR}/api/lib
-                   ${FMODEX_SDK_DIR}/api
-                   ${FMODEX_SDK_DIR}/lib
-                   ${FMODEX_SDK_DIR}
+                   "${FMODEX_SDK_DIR}/api/lib"
+                   "${FMODEX_SDK_DIR}/api"
+                   "${FMODEX_SDK_DIR}/lib"
+                   "${FMODEX_SDK_DIR}"
                    )
     elseif(WORD_SIZE EQUAL 64)
       find_library(FMODEX_LIBRARY
                    fmodex64 fmodexL64
                    PATHS
-                   ${FMODEX_SDK_DIR}/api/lib
-                   ${FMODEX_SDK_DIR}/api
-                   ${FMODEX_SDK_DIR}/lib
-                   ${FMODEX_SDK_DIR}
+                   "${FMODEX_SDK_DIR}/api/lib"
+                   "${FMODEX_SDK_DIR}/api"
+                   "${FMODEX_SDK_DIR}/lib"
+                   "${FMODEX_SDK_DIR}"
                    )
     endif(WORD_SIZE EQUAL 32)
   endif(FMODEX_SDK_DIR)
@@ -42,24 +30,24 @@ if (NOT FMODEX_LIBRARY)
     find_library(FMODEX_LIBRARY
                  fmodex_vc fmodexL_vc
                  PATHS
-                 ${FMODEX_PROG_DIR}/api/lib
-                 ${FMODEX_PROG_DIR}/api
-                 ${FMODEX_PROG_DIR}
+                 "${FMODEX_PROG_DIR}/api/lib"
+                 "${FMODEX_PROG_DIR}/api"
+                 "${FMODEX_PROG_DIR}"
                  )
     if(FMODEX_LIBRARY)
       message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}")
-      set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR})
-      set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR} CACHE PATH "Path to the FMOD Ex SDK." FORCE)
+      set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}")
+      set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}" CACHE PATH "Path to the FMOD Ex SDK." FORCE)
     endif(FMODEX_LIBRARY)
   endif(WINDOWS AND NOT FMODEX_LIBRARY)
 endif (NOT FMODEX_LIBRARY)
 
 find_path(FMODEX_INCLUDE_DIR fmod.hpp
-          ${LIBS_PREBUILT_DIR}/include/fmodex
-          ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex
-          ${FMODEX_SDK_DIR}/api/inc
-          ${FMODEX_SDK_DIR}/inc
-          ${FMODEX_SDK_DIR}
+          "${LIBS_PREBUILT_DIR}/include/fmodex"
+          "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex"
+          "${FMODEX_SDK_DIR}/api/inc"
+          "${FMODEX_SDK_DIR}/inc"
+          "${FMODEX_SDK_DIR}"
           )
 
 if(DARWIN)