diff --git a/clang/include/clang/Basic/CMakeLists.txt b/clang/include/clang/Basic/CMakeLists.txt
index 9d6e14f85d6b..9e643bb3c2c1 100644
--- a/clang/include/clang/Basic/CMakeLists.txt
+++ b/clang/include/clang/Basic/CMakeLists.txt
@@ -13,4 +13,8 @@ clang_diag_gen(Driver)
 clang_diag_gen(Frontend)
 clang_diag_gen(Lex)
 clang_diag_gen(Parse)
-clang_diag_gen(Sema)
\ No newline at end of file
+clang_diag_gen(Sema)
+tablegen(DiagnosticGroups.inc
+         -gen-clang-diag-groups)
+add_custom_target(ClangDiagnosticGroups
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/DiagnosticGroups.inc)