diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 884164934..494a3d3bb 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -10,9 +10,10 @@ include(ELFIO)
 if(FMODEX)
   include(FMODEX)
   set(FMOD OFF)
-else(FMODEX)
-  include(FMOD)
 endif(FMODEX)
+if(FMOD)
+  include(FMOD)
+endif(FMOD)
 include(OPENAL)
 include(FindOpenGL)
 include(Hunspell)
@@ -1368,13 +1369,10 @@ if (FMOD OR FMODEX)
     set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMOD")
   endif (FMOD)
 
-  if (DARWIN)
-    if(FMOD)
+  if (DARWIN AND FMOD)
       set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
       add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
-      if (FMOD)
-        set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
-      endif (FMOD)
+      set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
       set_target_properties(
         fmodwrapper
         PROPERTIES
@@ -1384,11 +1382,7 @@ if (FMOD OR FMODEX)
         )
       set(FMODWRAPPER_LIBRARY fmodwrapper)
       target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES})
-    endif(FMOD)
-    if(FMODEX)
-      set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY})
-    endif(FMODEX)
-  else (DARWIN)
+  else (DARWIN AND FMOD)
     # fmodwrapper unnecessary on linux or windows, for fmod and fmodex
     if (FMODEX)
        set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY})
@@ -1396,7 +1390,7 @@ if (FMOD OR FMODEX)
     if (FMOD)
        set(FMODWRAPPER_LIBRARY ${FMOD_LIBRARY})
     endif (FMOD)
-  endif (DARWIN)
+  endif (DARWIN AND FMOD)
 endif (FMOD OR FMODEX)
 
 set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")
@@ -1432,9 +1426,9 @@ set(PACKAGE ${PACKAGE_DEFAULT} CACHE BOOL
 if (WINDOWS)
     if(MSVC10)
         set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map")
-    else()
+    else(MSVC10)
         set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
-    endif()
+    endif(MSVC10)
 
     if (FMOD)
         if(MANIFEST_LIBRARIES)