diff --git a/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt b/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt
index 4cdeca5d5a9e2..3e68a42f10e07 100644
--- a/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt
+++ b/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt
@@ -2,9 +2,9 @@ add_llvm_component_library(LLVMARCDisassembler
   ARCDisassembler.cpp
 
   LINK_COMPONENTS
+  ARCInfo
   MCDisassembler
   Support
-  ARCInfo
 
   ADD_TO_COMPONENT
   ARC
diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/CSKY/MCTargetDesc/CMakeLists.txt
index a05f0ba654c08..da134c4e056ad 100644
--- a/llvm/lib/Target/CSKY/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/CSKY/MCTargetDesc/CMakeLists.txt
@@ -17,4 +17,4 @@ add_llvm_component_library(LLVMCSKYDesc
 
   ADD_TO_COMPONENT
   CSKY
-)
+  )
diff --git a/llvm/lib/Target/M68k/AsmParser/CMakeLists.txt b/llvm/lib/Target/M68k/AsmParser/CMakeLists.txt
index f4bbd39f1476f..a213dabcef148 100644
--- a/llvm/lib/Target/M68k/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/M68k/AsmParser/CMakeLists.txt
@@ -2,12 +2,12 @@ add_llvm_component_library(LLVMM68kAsmParser
   M68kAsmParser.cpp
 
   LINK_COMPONENTS
+  M68kCodeGen
+  M68kInfo
   MC
   MCParser
   Support
-  M68kCodeGen
-  M68kInfo
 
   ADD_TO_COMPONENT
   M68k
-)
+  )
diff --git a/llvm/unittests/Target/DirectX/CMakeLists.txt b/llvm/unittests/Target/DirectX/CMakeLists.txt
index dd3dc5c09255a..0fe608bff256e 100644
--- a/llvm/unittests/Target/DirectX/CMakeLists.txt
+++ b/llvm/unittests/Target/DirectX/CMakeLists.txt
@@ -8,7 +8,7 @@ set(LLVM_LINK_COMPONENTS
   Core
   DirectXCodeGen
   Support
-)
+  )
 
 add_llvm_target_unittest(DirectXTests
   CBufferDataLayoutTests.cpp
diff --git a/llvm/utils/TableGen/GlobalISel/CMakeLists.txt b/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
index d6b7a52168295..bce0ffc314860 100644
--- a/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
+++ b/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
@@ -4,15 +4,15 @@ set(LLVM_LINK_COMPONENTS
   )
 
 add_llvm_library(LLVMTableGenGlobalISel STATIC DISABLE_LLVM_LINK_LLVM_DYLIB
-                 CodeExpander.cpp
-                 GIMatchDag.cpp
-                 GIMatchDagEdge.cpp
-                 GIMatchDagInstr.cpp
-                 GIMatchDagOperands.cpp
-                 GIMatchDagPredicate.cpp
-                 GIMatchDagPredicateDependencyEdge.cpp
-                 GIMatchTree.cpp
-                )
+  CodeExpander.cpp
+  GIMatchDag.cpp
+  GIMatchDagEdge.cpp
+  GIMatchDagInstr.cpp
+  GIMatchDagOperands.cpp
+  GIMatchDagPredicate.cpp
+  GIMatchDagPredicateDependencyEdge.cpp
+  GIMatchTree.cpp
+  )
 
 # Users may include its headers as "GlobalISel/*.h"
 target_include_directories(LLVMTableGenGlobalISel