[llvm] 16e7973 - Renovate CMake file for the `llvm-cfi-verify` tool

[Jameson Nash via llvm-commits]

Author: Jameson Nash
Date: 2021-02-08T18:20:38-05:00
New Revision: 16e7973c5d8fb543ea9e91735be8610a8b1c262a

URL: https://github.com/llvm/llvm-project/commit/16e7973c5d8fb543ea9e91735be8610a8b1c262a
DIFF: https://github.com/llvm/llvm-project/commit/16e7973c5d8fb543ea9e91735be8610a8b1c262a.diff

LOG: Renovate CMake file for the `llvm-cfi-verify` tool

Hopefully this is the non-problematic part from https://reviews.llvm.org/rL342148, which later got reverted in r342336 (b09a8c9bd9b819741b38071a7ccd95042ef2643a) due to problems with the llvm-exegesis part of the change. That part would also still be desirable, but currently appears not to be possible (https://reviews.llvm.org/D81922).

I think this should replace https://reviews.llvm.org/D44650, per Keno's comment there.

Reviewed By: hctim

Differential Revision: https://reviews.llvm.org/D90969

Added: 
    

Modified: 
    llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
index 41d55ed93216..679bffe83efa 100644
--- a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
+++ b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
@@ -1,16 +1,4 @@
-add_library(LLVMCFIVerify
-  STATIC
-  FileAnalysis.cpp
-  FileAnalysis.h
-  GraphBuilder.cpp
-  GraphBuilder.h
-  )
-
-llvm_update_compile_flags(LLVMCFIVerify)
-if (LLVM_LINK_LLVM_DYLIB)
-  set(libs LLVM)
-else()
-  llvm_map_components_to_libnames(libs
+set(LLVM_LINK_COMPONENTS
     DebugInfoDWARF
     MC
     MCParser
@@ -18,6 +6,11 @@ else()
     Support
     Symbolize
     )
-endif()
-target_link_libraries(LLVMCFIVerify ${libs})
-set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")
+
+add_llvm_library(LLVMCFIVerify
+  STATIC
+  FileAnalysis.cpp
+  FileAnalysis.h
+  GraphBuilder.cpp
+  GraphBuilder.h
+  )