diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c80bdef..7910b5df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,13 +79,15 @@ elseif (CMAKE_COMPILER_IS_GNUCXX)
   # explicitly.
   set(cxx_no_rtti_flags "-fno-rtti -DGTEST_HAS_RTTI=0")
   set(cxx_strict_flags "-Wextra")
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "SunPro")
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
   set(cxx_exception_flags "-features=except")
   # Sun Pro doesn't provide macros to indicate whether exceptions and
   # RTTI are enabled, so we define GTEST_HAS_* explicitly.
   set(cxx_no_exception_flags "-features=no%except -DGTEST_HAS_EXCEPTIONS=0")
   set(cxx_no_rtti_flags "-features=no%rtti -DGTEST_HAS_RTTI=0")
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "VisualAge")
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "VisualAge" OR
+        CMAKE_CXX_COMPILER_ID STREQUAL "XL")
+  # CMake 2.8 changes Visual Age's compiler ID to "XL".
   set(cxx_exception_flags "-qeh")
   set(cxx_no_exception_flags "-qnoeh")
   # Until version 9.0, Visual Age doesn't define a macro to indicate