Index: llvm/trunk/cmake/modules/AddSphinxTarget.cmake
===================================================================
--- llvm/trunk/cmake/modules/AddSphinxTarget.cmake
+++ llvm/trunk/cmake/modules/AddSphinxTarget.cmake
@@ -71,6 +71,11 @@
                 COMPONENT "${project}-sphinx-man"
                 DESTINATION ${INSTALL_MANDIR}man1)
 
+        if(NOT LLVM_ENABLE_IDE)
+          add_llvm_install_targets("install-${SPHINX_TARGET_NAME}"
+                                   DEPENDS ${SPHINX_TARGET_NAME}
+                                   COMPONENT "${project}-sphinx-man")
+        endif()
       elseif (builder STREQUAL html)
         string(TOUPPER "${project}" project_upper)
         set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html"
@@ -82,6 +87,12 @@
         install(DIRECTORY "${SPHINX_BUILD_DIR}/."
                 COMPONENT "${project}-sphinx-html"
                 DESTINATION "${${project_upper}_INSTALL_SPHINX_HTML_DIR}")
+
+        if(NOT LLVM_ENABLE_IDE)
+          add_llvm_install_targets("install-${SPHINX_TARGET_NAME}"
+                                   DEPENDS ${SPHINX_TARGET_NAME}
+                                   COMPONENT "${project}-sphinx-html")
+        endif()
       else()
         message(WARNING Installation of ${builder} not supported)
       endif()
Index: llvm/trunk/cmake/modules/TableGen.cmake
===================================================================
--- llvm/trunk/cmake/modules/TableGen.cmake
+++ llvm/trunk/cmake/modules/TableGen.cmake
@@ -171,7 +171,13 @@
 
     install(TARGETS ${target}
             ${export_to_llvmexports}
+            COMPONENT ${target}
             RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR})
+    if(NOT LLVM_ENABLE_IDE)
+      add_llvm_install_targets("install-${target}"
+                               DEPENDS ${target}
+                               COMPONENT ${target})
+    endif()
   endif()
   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target})
 endmacro()
Index: llvm/trunk/tools/opt-viewer/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/opt-viewer/CMakeLists.txt
+++ llvm/trunk/tools/opt-viewer/CMakeLists.txt
@@ -11,3 +11,10 @@
     DESTINATION share/opt-viewer
     COMPONENT opt-viewer)
 endforeach (file)
+
+add_custom_target(opt-viewer DEPENDS ${files})
+if(NOT LLVM_ENABLE_IDE)
+  add_llvm_install_targets("install-opt-viewer"
+                           DEPENDS opt-viewer
+                           COMPONENT opt-viewer)
+endif()