diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 9f777827e..e7bc897c9 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -9,15 +9,15 @@ if (NOT STANDALONE)
   set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)
   set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
 
-  if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode)
+  if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
     # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us
     # fortunately both windows and darwin are case insensitive filesystems so this works.
     set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}")
-  else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode)
+  else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
     # else block is for linux and any other makefile based generators
     string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
     set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER})
-  endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode)
+  endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
 
   if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
     # When we're building something other than Release, append the
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 70d025d85..187412b4a 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -97,7 +97,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
 
-  if(${CMAKE_GENERATOR} MATCHES Xcode)
+  if(${CMAKE_GENERATOR} MATCHES "Xcode")
     #SDK Compiler and Deployment targets for XCode
     if (${XCODE_VERSION} VERSION_LESS 4.0.0)
       set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
@@ -106,10 +106,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
       set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
       set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
     endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
-  else(${CMAKE_GENERATOR} MATCHES Xcode)
+  else(${CMAKE_GENERATOR} MATCHES "Xcode")
     set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
     set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
-  endif(${CMAKE_GENERATOR} MATCHES Xcode)
+  endif(${CMAKE_GENERATOR} MATCHES "Xcode")
 
   set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")