From 92cb3eecbd9ba49ef04ed1b0cd70c549cace5d4c Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Thu, 17 Nov 2016 04:36:50 +0000 Subject: [PATCH] [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 --- lib/Analysis/CMakeLists.txt | 5 +++-- lib/Bitcode/Reader/CMakeLists.txt | 5 +++-- lib/CodeGen/AsmPrinter/CMakeLists.txt | 5 +++-- lib/CodeGen/CMakeLists.txt | 5 +++-- lib/CodeGen/GlobalISel/CMakeLists.txt | 5 +++-- lib/CodeGen/MIRParser/CMakeLists.txt | 5 +++-- lib/CodeGen/SelectionDAG/CMakeLists.txt | 5 +++-- lib/ExecutionEngine/Interpreter/CMakeLists.txt | 5 +++-- lib/IR/CMakeLists.txt | 5 +++-- lib/LTO/CMakeLists.txt | 5 +++-- lib/Passes/CMakeLists.txt | 5 +++-- lib/Target/AArch64/CMakeLists.txt | 5 +++-- lib/Target/AVR/CMakeLists.txt | 5 +++-- lib/Target/WebAssembly/CMakeLists.txt | 5 +++-- lib/Transforms/Coroutines/CMakeLists.txt | 5 +++-- lib/Transforms/IPO/CMakeLists.txt | 5 +++-- lib/Transforms/InstCombine/CMakeLists.txt | 5 +++-- lib/Transforms/Instrumentation/CMakeLists.txt | 5 +++-- lib/Transforms/ObjCARC/CMakeLists.txt | 5 +++-- lib/Transforms/Scalar/CMakeLists.txt | 5 +++-- lib/Transforms/Utils/CMakeLists.txt | 5 +++-- lib/Transforms/Vectorize/CMakeLists.txt | 5 +++-- 22 files changed, 66 insertions(+), 44 deletions(-) diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt index c612221d994..08d50c29dfc 100644 --- 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 62954f26e20..ca63f94607e 100644 --- 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 68a9973d77e..05c6a28bbca 100644 --- 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 4cc8290cacf..b08e7524f63 100644 --- 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 fe44b340843..e1648fce09e 100644 --- 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 7e757f68208..2eb5b844d0e 100644 --- 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 b3d26c41acf..a668ddb7389 100644 --- 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 4dbc2df4c74..7456b3dbe90 100644 --- 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 07cec97084e..11259cbe181 100644 --- 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 a8704b4c579..c73143eb330 100644 --- 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 6ceac7bd395..8fcadcf2c95 100644 --- 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 300a6ea947e..5c835eafb7e 100644 --- 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 716eca891ed..83f55020e88 100644 --- 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 70c95b94cab..f4d46383e5b 100644 --- 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 9a2217a2b14..1c635bd9db0 100644 --- 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 edbfa087194..fffa1c3356a 100644 --- 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 0ed8e6273db..5cbe804ce3e 100644 --- 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 57a569b3791..7ff69b9eb7f 100644 --- 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 98ad37f5d23..114471eb6f6 100644 --- 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 d6cef5fd351..7686b877555 100644 --- 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 b4982de419d..d7695a1b920 100644 --- 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 23c2ab025f3..395f440bda4 100644 --- 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 + ) -- 2.11.0