Index: compiler-rt/trunk/include/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/include/CMakeLists.txt
+++ compiler-rt/trunk/include/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 set(COMPILER_RT_HEADERS
   ${SANITIZER_HEADERS}
-	${XRAY_HEADERS})
+  ${XRAY_HEADERS})
 
 set(output_dir ${COMPILER_RT_OUTPUT_DIR}/include)
 
@@ -45,9 +45,27 @@
 
 # Install sanitizer headers.
 install(FILES ${SANITIZER_HEADERS}
+  COMPONENT compiler-rt-headers
   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
   DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer)
 # Install xray headers.
 install(FILES ${XRAY_HEADERS}
+  COMPONENT compiler-rt-headers
   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
   DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray)
+
+if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs.
+  add_custom_target(install-compiler-rt-headers
+                    DEPENDS compiler-rt-headers
+                    COMMAND "${CMAKE_COMMAND}"
+                            -DCMAKE_INSTALL_COMPONENT="compiler-rt-headers"
+                            -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
+                    USES_TERMINAL)
+  add_custom_target(install-compiler-rt-headers-stripped
+                    DEPENDS compiler-rt-headers
+                    COMMAND "${CMAKE_COMMAND}"
+                            -DCMAKE_INSTALL_COMPONENT="compiler-rt-headers"
+                            -DCMAKE_INSTALL_DO_STRIP=1
+                            -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
+                    USES_TERMINAL)
+endif()