[CMake] NFC. Updating CMake dependency specifications

This patch updates a bunch of places where add_dependencies was being explicitly called to add dependencies on intrinsics_gen to instead use the DEPENDS named parameter. This cleanup is needed for a patch I'm working on to add a dependency debugging mode to the build system.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@287206 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
index c612221d9949a781876c694e8a5ef28f94722f99..08d50c29dfc877bcb93a2e915cf49e779eb04b4a 100644 (file)
--- a/lib/Analysis/CMakeLists.txt
+++ b/lib/Analysis/CMakeLists.txt
@@ -83,6 +83,7 @@ add_llvm_library(LLVMAnalysis
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Analysis
-  )
 
-add_dependencies(LLVMAnalysis intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/Bitcode/Reader/CMakeLists.txt b/lib/Bitcode/Reader/CMakeLists.txt
index 62954f26e208b5244cff8dcbe710fa1d862aec87..ca63f94607e11f55b6443d575fded25f432edd4b 100644 (file)
--- a/lib/Bitcode/Reader/CMakeLists.txt
+++ b/lib/Bitcode/Reader/CMakeLists.txt
@@ -5,6 +5,7 @@ add_llvm_library(LLVMBitReader
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Bitcode
-  )
 
-add_dependencies(LLVMBitReader intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt b/lib/CodeGen/AsmPrinter/CMakeLists.txt
index 68a9973d77ef367ec9c4a4afe0b1202b85f4741b..05c6a28bbcaca223761ac040c4afddd96d447301 100644 (file)
--- a/lib/CodeGen/AsmPrinter/CMakeLists.txt
+++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt
@@ -22,6 +22,7 @@ add_llvm_library(LLVMAsmPrinter
   OcamlGCPrinter.cpp
   WinException.cpp
   CodeViewDebug.cpp
-  )
 
-add_dependencies(LLVMAsmPrinter intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/CodeGen/CMakeLists.txt b/lib/CodeGen/CMakeLists.txt
index 4cc8290cacfb4e74058bb184b88f2326daec1613..b08e7524f6347f380fbb2bc00118f99f94057317 100644 (file)
--- a/lib/CodeGen/CMakeLists.txt
+++ b/lib/CodeGen/CMakeLists.txt
@@ -147,9 +147,10 @@ add_llvm_library(LLVMCodeGen
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/CodeGen/PBQP
 
   LINK_LIBS ${PTHREAD_LIB}
-  )
 
-add_dependencies(LLVMCodeGen intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )
 
 add_subdirectory(SelectionDAG)
 add_subdirectory(AsmPrinter)

diff --git a/lib/CodeGen/GlobalISel/CMakeLists.txt b/lib/CodeGen/GlobalISel/CMakeLists.txt
index fe44b3408433ceeed07bebb154a948b15459de50..e1648fce09e095b843f2be84eab645d71fe47348 100644 (file)
--- a/lib/CodeGen/GlobalISel/CMakeLists.txt
+++ b/lib/CodeGen/GlobalISel/CMakeLists.txt
@@ -28,6 +28,7 @@ endif()
 add_llvm_library(LLVMGlobalISel
         ${GLOBAL_ISEL_BUILD_FILES}
         GlobalISel.cpp
+        
+        DEPENDS
+        intrinsics_gen
   )
-
-add_dependencies(LLVMGlobalISel intrinsics_gen)

diff --git a/lib/CodeGen/MIRParser/CMakeLists.txt b/lib/CodeGen/MIRParser/CMakeLists.txt
index 7e757f68208f76858a47cbf03257c67b1e4444cc..2eb5b844d0e11ee45521de9c84c4e6e7fd30376c 100644 (file)
--- a/lib/CodeGen/MIRParser/CMakeLists.txt
+++ b/lib/CodeGen/MIRParser/CMakeLists.txt
@@ -2,6 +2,7 @@ add_llvm_library(LLVMMIRParser
   MILexer.cpp
   MIParser.cpp
   MIRParser.cpp
-  )
 
-add_dependencies(LLVMMIRParser intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/CodeGen/SelectionDAG/CMakeLists.txt b/lib/CodeGen/SelectionDAG/CMakeLists.txt
index b3d26c41acf7c709615c78ec86667a6c38bf4d5a..a668ddb7389f1161c375ba4a92e5751277419fb1 100644 (file)
--- a/lib/CodeGen/SelectionDAG/CMakeLists.txt
+++ b/lib/CodeGen/SelectionDAG/CMakeLists.txt
@@ -23,6 +23,7 @@ add_llvm_library(LLVMSelectionDAG
   SelectionDAGTargetInfo.cpp
   StatepointLowering.cpp
   TargetLowering.cpp
+  
+  DEPENDS
+  intrinsics_gen
   )
-
-add_dependencies(LLVMSelectionDAG intrinsics_gen)

diff --git a/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/lib/ExecutionEngine/Interpreter/CMakeLists.txt
index 4dbc2df4c74f25323075ca5c8a57b4754eecf3c5..7456b3dbe905ad82b33e6caae82bb3d9e4a9d27d 100644 (file)
--- a/lib/ExecutionEngine/Interpreter/CMakeLists.txt
+++ b/lib/ExecutionEngine/Interpreter/CMakeLists.txt
@@ -10,10 +10,11 @@ add_llvm_library(LLVMInterpreter
   Execution.cpp
   ExternalFunctions.cpp
   Interpreter.cpp
+
+  DEPENDS
+  intrinsics_gen
   )
 
 if( LLVM_ENABLE_FFI )
   target_link_libraries( LLVMInterpreter PRIVATE ${FFI_LIBRARY_PATH} )
 endif()
-
-add_dependencies(LLVMInterpreter intrinsics_gen)

diff --git a/lib/IR/CMakeLists.txt b/lib/IR/CMakeLists.txt
index 07cec97084ee280983921f8d35eb29544dd9c1ad..11259cbe18152573c147537292c0067b6a7564c7 100644 (file)
--- a/lib/IR/CMakeLists.txt
+++ b/lib/IR/CMakeLists.txt
@@ -56,6 +56,7 @@ add_llvm_library(LLVMCore
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/IR
-  )
 
-add_dependencies(LLVMCore intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/LTO/CMakeLists.txt b/lib/LTO/CMakeLists.txt
index a8704b4c579cecfca6c6dc4a57499db7330ae8f2..c73143eb330beaca23bc4ca68bae0988480d6900 100644 (file)
--- a/lib/LTO/CMakeLists.txt
+++ b/lib/LTO/CMakeLists.txt
@@ -59,6 +59,7 @@ add_llvm_library(LLVMLTO
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/LTO
-)
 
-add_dependencies(LLVMLTO intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+)

diff --git a/lib/Passes/CMakeLists.txt b/lib/Passes/CMakeLists.txt
index 6ceac7bd395f532137ab995b42cba1f8fec09bc5..8fcadcf2c958cc65151e08ba7f62a8f948118606 100644 (file)
--- a/lib/Passes/CMakeLists.txt
+++ b/lib/Passes/CMakeLists.txt
@@ -3,6 +3,7 @@ add_llvm_library(LLVMPasses
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Passes
-  )
 
-add_dependencies(LLVMPasses intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/Target/AArch64/CMakeLists.txt b/lib/Target/AArch64/CMakeLists.txt
index 300a6ea947e37ae74fd6e998d14bc5246030f450..5c835eafb7ec33c09065879361a6ad5611783f9e 100644 (file)
--- a/lib/Target/AArch64/CMakeLists.txt
+++ b/lib/Target/AArch64/CMakeLists.txt
@@ -64,9 +64,10 @@ add_llvm_target(AArch64CodeGen
   AArch64TargetTransformInfo.cpp
   AArch64VectorByElementOpt.cpp
   ${GLOBAL_ISEL_BUILD_FILES}
-)
 
-add_dependencies(LLVMAArch64CodeGen intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+)
 
 add_subdirectory(TargetInfo)
 add_subdirectory(AsmParser)

diff --git a/lib/Target/AVR/CMakeLists.txt b/lib/Target/AVR/CMakeLists.txt
index 716eca891ed8d8f6eb67e52fed35a91cf2b517f7..83f55020e88c331a22f2258ba69bbcb7710faebe 100644 (file)
--- a/lib/Target/AVR/CMakeLists.txt
+++ b/lib/Target/AVR/CMakeLists.txt
@@ -28,9 +28,10 @@ add_llvm_target(AVRCodeGen
   AVRSubtarget.cpp
   AVRTargetMachine.cpp
   AVRTargetObjectFile.cpp
-)
 
-add_dependencies(LLVMAVRCodeGen intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+)
 
 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)

diff --git a/lib/Target/WebAssembly/CMakeLists.txt b/lib/Target/WebAssembly/CMakeLists.txt
index 70c95b94cabb99fa3819aea4952f2d85f473bcf3..f4d46383e5bb81ade1bce285e37a78bd7084f654 100644 (file)
--- a/lib/Target/WebAssembly/CMakeLists.txt
+++ b/lib/Target/WebAssembly/CMakeLists.txt
@@ -42,9 +42,10 @@ add_llvm_target(WebAssemblyCodeGen
   WebAssemblyTargetObjectFile.cpp
   WebAssemblyTargetTransformInfo.cpp
   WebAssemblyUtilities.cpp
-)
 
-add_dependencies(LLVMWebAssemblyCodeGen intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+)
 
 add_subdirectory(Disassembler)
 add_subdirectory(InstPrinter)

diff --git a/lib/Transforms/Coroutines/CMakeLists.txt b/lib/Transforms/Coroutines/CMakeLists.txt
index 9a2217a2b14c848829f99461f4588332a9b3db15..1c635bd9db08ac6cb85fb44615aeb4e499476f54 100644 (file)
--- a/lib/Transforms/Coroutines/CMakeLists.txt
+++ b/lib/Transforms/Coroutines/CMakeLists.txt
@@ -5,6 +5,7 @@ add_llvm_library(LLVMCoroutines
   CoroElide.cpp
   CoroFrame.cpp
   CoroSplit.cpp  
-  )
 
-add_dependencies(LLVMCoroutines intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/Transforms/IPO/CMakeLists.txt b/lib/Transforms/IPO/CMakeLists.txt
index edbfa08719424cad2751416344ec5a127bc0bbac..fffa1c3356a453d469380d3098ed40b06297113b 100644 (file)
--- a/lib/Transforms/IPO/CMakeLists.txt
+++ b/lib/Transforms/IPO/CMakeLists.txt
@@ -33,6 +33,7 @@ add_llvm_library(LLVMipo
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms/IPO
-  )
 
-add_dependencies(LLVMipo intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/Transforms/InstCombine/CMakeLists.txt b/lib/Transforms/InstCombine/CMakeLists.txt
index 0ed8e6273dbc6474a8a856624438c5196c54016d..5cbe804ce3ec03f47d5212f94dc17531d9903f6e 100644 (file)
--- a/lib/Transforms/InstCombine/CMakeLists.txt
+++ b/lib/Transforms/InstCombine/CMakeLists.txt
@@ -16,6 +16,7 @@ add_llvm_library(LLVMInstCombine
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms/InstCombine
-  )
 
-add_dependencies(LLVMInstCombine intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/Transforms/Instrumentation/CMakeLists.txt b/lib/Transforms/Instrumentation/CMakeLists.txt
index 57a569b3791ee5b21da8ae7401ebc0a69dbc3189..7ff69b9eb7f4277364f7e38de091c010e6784710 100644 (file)
--- a/lib/Transforms/Instrumentation/CMakeLists.txt
+++ b/lib/Transforms/Instrumentation/CMakeLists.txt
@@ -14,6 +14,7 @@ add_llvm_library(LLVMInstrumentation
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms
-  )
 
-add_dependencies(LLVMInstrumentation intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/Transforms/ObjCARC/CMakeLists.txt b/lib/Transforms/ObjCARC/CMakeLists.txt
index 98ad37f5d2302480916e8aab33cdb20c532e5354..114471eb6f6e14010438e06defdde918a02c598c 100644 (file)
--- a/lib/Transforms/ObjCARC/CMakeLists.txt
+++ b/lib/Transforms/ObjCARC/CMakeLists.txt
@@ -11,6 +11,7 @@ add_llvm_library(LLVMObjCARCOpts
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms
-  )
 
-add_dependencies(LLVMObjCARCOpts intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/Transforms/Scalar/CMakeLists.txt b/lib/Transforms/Scalar/CMakeLists.txt
index d6cef5fd351831789a8b6c040f2c90b6fe7a556a..7686b877555662e1d8884a1b1f3a691518cc2e3e 100644 (file)
--- a/lib/Transforms/Scalar/CMakeLists.txt
+++ b/lib/Transforms/Scalar/CMakeLists.txt
@@ -59,6 +59,7 @@ add_llvm_library(LLVMScalarOpts
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms/Scalar
-  )
 
-add_dependencies(LLVMScalarOpts intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/Transforms/Utils/CMakeLists.txt b/lib/Transforms/Utils/CMakeLists.txt
index b4982de419daf718ae1a45901fa6fa781fdd4f18..d7695a1b92041c60a807447ad6a29233e528c8dc 100644 (file)
--- a/lib/Transforms/Utils/CMakeLists.txt
+++ b/lib/Transforms/Utils/CMakeLists.txt
@@ -54,6 +54,7 @@ add_llvm_library(LLVMTransformUtils
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms/Utils
-  )
 
-add_dependencies(LLVMTransformUtils intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )

diff --git a/lib/Transforms/Vectorize/CMakeLists.txt b/lib/Transforms/Vectorize/CMakeLists.txt
index 23c2ab025f375cf9ca517b9b8987a25047581b4c..395f440bda47021a4d5ee4943ef648bfedf21b75 100644 (file)
--- a/lib/Transforms/Vectorize/CMakeLists.txt
+++ b/lib/Transforms/Vectorize/CMakeLists.txt
@@ -7,6 +7,7 @@ add_llvm_library(LLVMVectorize
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms
-  )
 
-add_dependencies(LLVMVectorize intrinsics_gen)
+  DEPENDS
+  intrinsics_gen
+  )