diff --git a/tools/llvm-cfi-verify/lib/CMakeLists.txt b/tools/llvm-cfi-verify/lib/CMakeLists.txt
index cf5e2bad13f7..82ca42e624a4 100644
--- a/tools/llvm-cfi-verify/lib/CMakeLists.txt
+++ b/tools/llvm-cfi-verify/lib/CMakeLists.txt
@@ -1,12 +1,13 @@
-add_llvm_library(LLVMCFIVerify
+add_library(LLVMCFIVerify
+  STATIC
   FileAnalysis.cpp
   FileAnalysis.h
   GraphBuilder.cpp
   GraphBuilder.h
+  )
 
-  STATIC
-
-  LINK_COMPONENTS
+llvm_update_compile_flags(LLVMCFIVerify)
+llvm_map_components_to_libnames(libs
   DebugInfoDWARF
   MC
   MCParser
@@ -14,3 +15,5 @@ add_llvm_library(LLVMCFIVerify
   Support
   Symbolize
   )
+target_link_libraries(LLVMCFIVerify ${libs})
+set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")
diff --git a/tools/llvm-exegesis/CMakeLists.txt b/tools/llvm-exegesis/CMakeLists.txt
index 8f9b40ddb882..65b1ada85299 100644
--- a/tools/llvm-exegesis/CMakeLists.txt
+++ b/tools/llvm-exegesis/CMakeLists.txt
@@ -1,15 +1,11 @@
 
 set(LLVM_LINK_COMPONENTS
-  MC
   Support
   native
   )
 
 add_llvm_tool(llvm-exegesis
   llvm-exegesis.cpp
-
-  DEPENDS
-  intrinsics_gen
   )
 
 add_subdirectory(lib)
diff --git a/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt b/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
index e04649a7e97e..a251b8ff683e 100644
--- a/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
+++ b/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
@@ -3,15 +3,16 @@ include_directories(
   ${LLVM_BINARY_DIR}/lib/Target/AArch64
   )
 
-add_llvm_library(LLVMExegesisAArch64
-  Target.cpp
-
+add_library(LLVMExegesisAArch64
   STATIC
+  Target.cpp
+  )
 
-  DEPENDS
-  intrinsics_gen
-
-  LINK_COMPONENTS
+llvm_update_compile_flags(LLVMExegesisAArch64)
+llvm_map_components_to_libnames(libs
   AArch64
   Exegesis
   )
+
+target_link_libraries(LLVMExegesisAArch64 ${libs})
+set_target_properties(LLVMExegesisAArch64 PROPERTIES FOLDER "Libraries")
diff --git a/tools/llvm-exegesis/lib/CMakeLists.txt b/tools/llvm-exegesis/lib/CMakeLists.txt
index 7574a0b8a580..17e6a9897e93 100644
--- a/tools/llvm-exegesis/lib/CMakeLists.txt
+++ b/tools/llvm-exegesis/lib/CMakeLists.txt
@@ -7,12 +7,8 @@ if (LLVM_TARGETS_TO_BUILD MATCHES "AArch64")
   set(LLVM_EXEGESIS_TARGETS "${LLVM_EXEGESIS_TARGETS} AArch64" PARENT_SCOPE)
 endif()
 
-set(libs)
-if(LLVM_ENABLE_LIBPFM AND HAVE_LIBPFM)
-  list(APPEND libs pfm)
-endif()
-
-add_llvm_library(LLVMExegesis
+add_library(LLVMExegesis
+  STATIC
   Analysis.cpp
   Assembler.cpp
   BenchmarkResult.cpp
@@ -26,13 +22,10 @@ add_llvm_library(LLVMExegesis
   SnippetGenerator.cpp
   Target.cpp
   Uops.cpp
+  )
 
-  STATIC
-
-  DEPENDS
-  intrinsics_gen
-
-  LINK_COMPONENTS
+llvm_update_compile_flags(LLVMExegesis)
+llvm_map_components_to_libnames(libs
   Analysis
   CodeGen
   Core
@@ -44,6 +37,11 @@ add_llvm_library(LLVMExegesis
   Object
   ObjectYAML
   Support
-
-  LINK_LIBS ${libs}
   )
+
+if(LLVM_ENABLE_LIBPFM AND HAVE_LIBPFM)
+  list(APPEND libs pfm)
+endif()
+
+target_link_libraries(LLVMExegesis ${libs})
+set_target_properties(LLVMExegesis PROPERTIES FOLDER "Libraries")
diff --git a/tools/llvm-exegesis/lib/X86/CMakeLists.txt b/tools/llvm-exegesis/lib/X86/CMakeLists.txt
index 0f4cc1e17b00..912877dd6ed1 100644
--- a/tools/llvm-exegesis/lib/X86/CMakeLists.txt
+++ b/tools/llvm-exegesis/lib/X86/CMakeLists.txt
@@ -3,15 +3,16 @@ include_directories(
   ${LLVM_BINARY_DIR}/lib/Target/X86
   )
 
-add_llvm_library(LLVMExegesisX86
-  Target.cpp
-
+add_library(LLVMExegesisX86
   STATIC
+  Target.cpp
+  )
 
-  DEPENDS
-  intrinsics_gen
-
-  LINK_COMPONENTS
+llvm_update_compile_flags(LLVMExegesisX86)
+llvm_map_components_to_libnames(libs
   X86
   Exegesis
   )
+
+target_link_libraries(LLVMExegesisX86 ${libs})
+set_target_properties(LLVMExegesisX86 PROPERTIES FOLDER "Libraries")
diff --git a/tools/llvm-mca/lib/CMakeLists.txt b/tools/llvm-mca/lib/CMakeLists.txt
index 6fc20e60d9b5..df9ed32acfe7 100644
--- a/tools/llvm-mca/lib/CMakeLists.txt
+++ b/tools/llvm-mca/lib/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_directories(${LLVM_MCA_SOURCE_DIR}/include)
 
-add_llvm_library(LLVMMCA
+add_library(LLVMMCA
+  STATIC
   Context.cpp
   HWEventListener.cpp
   HardwareUnits/HardwareUnit.cpp
@@ -19,11 +20,14 @@ add_llvm_library(LLVMMCA
   Stages/RetireStage.cpp
   Stages/Stage.cpp
   Support.cpp
+  )
 
-  STATIC
-
-  LINK_COMPONENTS
+llvm_update_compile_flags(LLVMMCA)
+llvm_map_components_to_libnames(libs
   CodeGen
   MC
   Support
   )
+
+target_link_libraries(LLVMMCA ${libs})
+set_target_properties(LLVMMCA PROPERTIES FOLDER "Libraries")
diff --git a/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt b/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
index 88fc0a4de430..b000974938f7 100644
--- a/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
+++ b/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
@@ -11,7 +11,6 @@ set(LLVM_LINK_COMPONENTS
   Support
   Symbolize
   ARM
-  Core
   )
 
 add_llvm_unittest(LLVMExegesisARMTests
diff --git a/unittests/tools/llvm-exegesis/X86/CMakeLists.txt b/unittests/tools/llvm-exegesis/X86/CMakeLists.txt
index 81e49bf89652..5a74c87d9b5f 100644
--- a/unittests/tools/llvm-exegesis/X86/CMakeLists.txt
+++ b/unittests/tools/llvm-exegesis/X86/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories(
   )
 
 set(LLVM_LINK_COMPONENTS
-  Core
   MC
   MCParser
   Object