diff options
author | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-13 23:59:48 +0000 |
---|---|---|
committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-13 23:59:48 +0000 |
commit | 3a210e2d302758101ac06946e86027b327c7d0f3 (patch) | |
tree | e12390ee573b3d34a2b48b5aadfcb52d2b46296a /lib | |
parent | bd916c54b7989ddbab373c61eb1ed2556ca44d27 (diff) | |
download | llvm-3a210e2d302758101ac06946e86027b327c7d0f3.tar.gz llvm-3a210e2d302758101ac06946e86027b327c7d0f3.tar.bz2 llvm-3a210e2d302758101ac06946e86027b327c7d0f3.tar.xz |
Revert "CMake: Get rid of LLVMLibDeps.cmake and export the libraries normally."
This reverts commit r113632
Conflicts:
cmake/modules/AddLLVM.cmake
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@113819 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
27 files changed, 14 insertions, 135 deletions
diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt index e221c6e25f..6a2ab681d1 100644 --- a/lib/Analysis/CMakeLists.txt +++ b/lib/Analysis/CMakeLists.txt @@ -50,4 +50,4 @@ add_llvm_library(LLVMAnalysis ValueTracking.cpp ) -target_link_libraries(LLVMAnalysis LLVMCore LLVMTarget) +target_link_libraries (LLVMAnalysis LLVMSupport) diff --git a/lib/Analysis/IPA/CMakeLists.txt b/lib/Analysis/IPA/CMakeLists.txt index b63a8499c7..007ad228ae 100644 --- a/lib/Analysis/IPA/CMakeLists.txt +++ b/lib/Analysis/IPA/CMakeLists.txt @@ -4,5 +4,3 @@ add_llvm_library(LLVMipa FindUsedTypes.cpp GlobalsModRef.cpp ) - -target_link_libraries(LLVMipa LLVMAnalysis LLVMCore) diff --git a/lib/Archive/CMakeLists.txt b/lib/Archive/CMakeLists.txt index e5c5fbd457..7ff478a41a 100644 --- a/lib/Archive/CMakeLists.txt +++ b/lib/Archive/CMakeLists.txt @@ -3,5 +3,3 @@ add_llvm_library(LLVMArchive ArchiveReader.cpp ArchiveWriter.cpp ) - -target_link_libraries(LLVMArchive LLVMBitReader LLVMCore) diff --git a/lib/AsmParser/CMakeLists.txt b/lib/AsmParser/CMakeLists.txt index 02ea240dde..985ebe2009 100644 --- a/lib/AsmParser/CMakeLists.txt +++ b/lib/AsmParser/CMakeLists.txt @@ -4,5 +4,3 @@ add_llvm_library(LLVMAsmParser LLParser.cpp Parser.cpp ) - -target_link_libraries(LLVMAsmParser LLVMCore) diff --git a/lib/Bitcode/Reader/CMakeLists.txt b/lib/Bitcode/Reader/CMakeLists.txt index 7601d83f0c..693d4310b8 100644 --- a/lib/Bitcode/Reader/CMakeLists.txt +++ b/lib/Bitcode/Reader/CMakeLists.txt @@ -2,5 +2,3 @@ add_llvm_library(LLVMBitReader BitReader.cpp BitcodeReader.cpp ) - -target_link_libraries(LLVMBitReader LLVMCore) diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt b/lib/CodeGen/AsmPrinter/CMakeLists.txt index ef6e157e86..ca8b8436c1 100644 --- a/lib/CodeGen/AsmPrinter/CMakeLists.txt +++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt @@ -8,11 +8,4 @@ add_llvm_library(LLVMAsmPrinter OcamlGCPrinter.cpp ) -target_link_libraries (LLVMAsmPrinter - LLVMAnalysis - LLVMCodeGen - LLVMCore - LLVMMC - LLVMMCParser - LLVMTarget - ) +target_link_libraries (LLVMAsmPrinter LLVMMCParser) diff --git a/lib/CodeGen/CMakeLists.txt b/lib/CodeGen/CMakeLists.txt index 068ad2f1c6..2ef115dbd2 100644 --- a/lib/CodeGen/CMakeLists.txt +++ b/lib/CodeGen/CMakeLists.txt @@ -83,11 +83,4 @@ add_llvm_library(LLVMCodeGen VirtRegRewriter.cpp ) -target_link_libraries (LLVMCodeGen - LLVMAnalysis - LLVMCore - LLVMMC - LLVMScalarOpts - LLVMTarget - LLVMTransformUtils - ) +target_link_libraries (LLVMCodeGen LLVMCore LLVMScalarOpts) diff --git a/lib/CodeGen/SelectionDAG/CMakeLists.txt b/lib/CodeGen/SelectionDAG/CMakeLists.txt index ce3259a7f3..799988a4c8 100644 --- a/lib/CodeGen/SelectionDAG/CMakeLists.txt +++ b/lib/CodeGen/SelectionDAG/CMakeLists.txt @@ -22,10 +22,4 @@ add_llvm_library(LLVMSelectionDAG TargetSelectionDAGInfo.cpp ) -target_link_libraries(LLVMSelectionDAG - LLVMAnalysis - LLVMCodeGen - LLVMCore - LLVMMC - LLVMTarget - ) +target_link_libraries (LLVMSelectionDAG LLVMAnalysis LLVMAsmPrinter LLVMCodeGen) diff --git a/lib/CompilerDriver/CMakeLists.txt b/lib/CompilerDriver/CMakeLists.txt index afe6665ddf..153dd443cb 100644 --- a/lib/CompilerDriver/CMakeLists.txt +++ b/lib/CompilerDriver/CMakeLists.txt @@ -1,3 +1,4 @@ +set(LLVM_LINK_COMPONENTS support system) set(LLVM_REQUIRES_EH 1) add_llvm_tool(llvmc diff --git a/lib/ExecutionEngine/CMakeLists.txt b/lib/ExecutionEngine/CMakeLists.txt index efedd65e78..0e118ccd90 100644 --- a/lib/ExecutionEngine/CMakeLists.txt +++ b/lib/ExecutionEngine/CMakeLists.txt @@ -2,5 +2,3 @@ add_llvm_library(LLVMExecutionEngine ExecutionEngine.cpp ExecutionEngineBindings.cpp ) - -target_link_libraries(LLVMExecutionEngine LLVMCore LLVMTarget) diff --git a/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/lib/ExecutionEngine/Interpreter/CMakeLists.txt index b517d99eb8..dff97fa26e 100644 --- a/lib/ExecutionEngine/Interpreter/CMakeLists.txt +++ b/lib/ExecutionEngine/Interpreter/CMakeLists.txt @@ -3,10 +3,3 @@ add_llvm_library(LLVMInterpreter ExternalFunctions.cpp Interpreter.cpp ) - -target_link_libraries(LLVMInterpreter - LLVMCodeGen - LLVMCore - LLVMExecutionEngine - LLVMTarget - ) diff --git a/lib/ExecutionEngine/JIT/CMakeLists.txt b/lib/ExecutionEngine/JIT/CMakeLists.txt index d81b162a4a..42020d69af 100644 --- a/lib/ExecutionEngine/JIT/CMakeLists.txt +++ b/lib/ExecutionEngine/JIT/CMakeLists.txt @@ -11,11 +11,3 @@ add_llvm_library(LLVMJIT OProfileJITEventListener.cpp TargetSelect.cpp ) - -target_link_libraries(LLVMJIT - LLVMCodeGen - LLVMCore - LLVMExecutionEngine - LLVMMC - LLVMTarget - ) diff --git a/lib/Linker/CMakeLists.txt b/lib/Linker/CMakeLists.txt index 6a8b7676bd..0b6d2f4218 100644 --- a/lib/Linker/CMakeLists.txt +++ b/lib/Linker/CMakeLists.txt @@ -4,10 +4,3 @@ add_llvm_library(LLVMLinker LinkModules.cpp Linker.cpp ) - -target_link_libraries(LLVMLinker - LLVMArchive - LLVMBitReader - LLVMCore - LLVMTransformUtils - ) diff --git a/lib/MC/MCDisassembler/CMakeLists.txt b/lib/MC/MCDisassembler/CMakeLists.txt index a01b78e5ac..5fa7b70194 100644 --- a/lib/MC/MCDisassembler/CMakeLists.txt +++ b/lib/MC/MCDisassembler/CMakeLists.txt @@ -1,8 +1,7 @@ + add_llvm_library(LLVMMCDisassembler EDDisassembler.cpp EDOperand.cpp EDInst.cpp EDToken.cpp ) - -add_llvm_link_components(LLVMMCDisassembler all) diff --git a/lib/Target/ARM/AsmParser/CMakeLists.txt b/lib/Target/ARM/AsmParser/CMakeLists.txt index 1fa6022a46..9ba7c0125d 100644 --- a/lib/Target/ARM/AsmParser/CMakeLists.txt +++ b/lib/Target/ARM/AsmParser/CMakeLists.txt @@ -5,9 +5,3 @@ add_llvm_library(LLVMARMAsmParser ARMAsmParser.cpp ) -target_link_libraries(LLVMARMAsmParser - LLVMARMInfo - LLVMMC - LLVMMCParser - LLVMTarget - ) diff --git a/lib/Target/ARM/AsmPrinter/CMakeLists.txt b/lib/Target/ARM/AsmPrinter/CMakeLists.txt index da4dd8e606..18645c0864 100644 --- a/lib/Target/ARM/AsmPrinter/CMakeLists.txt +++ b/lib/Target/ARM/AsmPrinter/CMakeLists.txt @@ -3,6 +3,4 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMARMAsmPrinter ARMInstPrinter.cpp ) - add_dependencies(LLVMARMAsmPrinter ARMCodeGenTable_gen) -target_link_libraries(LLVMARMAsmPrinter LLVMMC) diff --git a/lib/Target/ARM/CMakeLists.txt b/lib/Target/ARM/CMakeLists.txt index 7b0ee2b7e2..c381067b86 100644 --- a/lib/Target/ARM/CMakeLists.txt +++ b/lib/Target/ARM/CMakeLists.txt @@ -46,13 +46,4 @@ add_llvm_target(ARMCodeGen Thumb2SizeReduction.cpp ) -target_link_libraries (LLVMARMCodeGen - LLVMARMInfo - LLVMAnalysis - LLVMAsmPrinter - LLVMCodeGen - LLVMCore - LLVMMC - LLVMSelectionDAG - LLVMTarget - ) +target_link_libraries (LLVMARMCodeGen LLVMARMAsmPrinter LLVMSelectionDAG) diff --git a/lib/Target/CMakeLists.txt b/lib/Target/CMakeLists.txt index 242b52f639..43ebdac528 100644 --- a/lib/Target/CMakeLists.txt +++ b/lib/Target/CMakeLists.txt @@ -13,5 +13,3 @@ add_llvm_library(LLVMTarget TargetRegisterInfo.cpp TargetSubtarget.cpp ) - -target_link_libraries(LLVMTarget LLVMCore LLVMMC) diff --git a/lib/Target/X86/AsmParser/CMakeLists.txt b/lib/Target/X86/AsmParser/CMakeLists.txt index 897db3a957..40dbdd72fa 100644 --- a/lib/Target/X86/AsmParser/CMakeLists.txt +++ b/lib/Target/X86/AsmParser/CMakeLists.txt @@ -4,11 +4,4 @@ add_llvm_library(LLVMX86AsmParser X86AsmLexer.cpp X86AsmParser.cpp ) - add_dependencies(LLVMX86AsmParser X86CodeGenTable_gen) -target_link_libraries(LLVMX86AsmParser - LLVMMC - LLVMMCParser - LLVMTarget - LLVMX86Info - ) diff --git a/lib/Target/X86/AsmPrinter/CMakeLists.txt b/lib/Target/X86/AsmPrinter/CMakeLists.txt index 71ee884cc3..033973eeef 100644 --- a/lib/Target/X86/AsmPrinter/CMakeLists.txt +++ b/lib/Target/X86/AsmPrinter/CMakeLists.txt @@ -5,6 +5,4 @@ add_llvm_library(LLVMX86AsmPrinter X86IntelInstPrinter.cpp X86InstComments.cpp ) - add_dependencies(LLVMX86AsmPrinter X86CodeGenTable_gen) -target_link_libraries(LLVMX86AsmPrinter LLVMMC) diff --git a/lib/Target/X86/CMakeLists.txt b/lib/Target/X86/CMakeLists.txt index f4e0331644..e9399f5c83 100644 --- a/lib/Target/X86/CMakeLists.txt +++ b/lib/Target/X86/CMakeLists.txt @@ -29,7 +29,7 @@ set(sources X86InstrInfo.cpp X86JITInfo.cpp X86MCAsmInfo.cpp - X86MCCodeEmitter.cpp + X86MCCodeEmitter.cpp X86MCInstLower.cpp X86RegisterInfo.cpp X86SelectionDAGInfo.cpp @@ -49,14 +49,4 @@ if( CMAKE_CL_64 ) endif() add_llvm_target(X86CodeGen ${sources}) -target_link_libraries(LLVMX86CodeGen - LLVMAnalysis - LLVMAsmPrinter - LLVMCodeGen - LLVMCore - LLVMMC - LLVMSelectionDAG - LLVMTarget - LLVMX86AsmPrinter - LLVMX86Info - ) + diff --git a/lib/Target/X86/Disassembler/CMakeLists.txt b/lib/Target/X86/Disassembler/CMakeLists.txt index 91411f3e9f..97589c0051 100644 --- a/lib/Target/X86/Disassembler/CMakeLists.txt +++ b/lib/Target/X86/Disassembler/CMakeLists.txt @@ -11,6 +11,4 @@ set_property( PROPERTY COMPILE_FLAGS "/Od" ) endif() - add_dependencies(LLVMX86Disassembler X86CodeGenTable_gen) -target_link_libraries(LLVMX86Disassembler LLVMMC LLVMX86Info) diff --git a/lib/Transforms/IPO/CMakeLists.txt b/lib/Transforms/IPO/CMakeLists.txt index b07d0947ed..65483e8fed 100644 --- a/lib/Transforms/IPO/CMakeLists.txt +++ b/lib/Transforms/IPO/CMakeLists.txt @@ -24,11 +24,4 @@ add_llvm_library(LLVMipo StructRetPromotion.cpp ) -target_link_libraries(LLVMipo - LLVMAnalysis - LLVMCore - LLVMScalarOpts - LLVMTarget - LLVMTransformUtils - LLVMipa - ) +target_link_libraries (LLVMipo LLVMScalarOpts LLVMInstCombine) diff --git a/lib/Transforms/InstCombine/CMakeLists.txt b/lib/Transforms/InstCombine/CMakeLists.txt index 4330377850..5b1ff3e23b 100644 --- a/lib/Transforms/InstCombine/CMakeLists.txt +++ b/lib/Transforms/InstCombine/CMakeLists.txt @@ -9,14 +9,9 @@ add_llvm_library(LLVMInstCombine InstCombineMulDivRem.cpp InstCombinePHI.cpp InstCombineSelect.cpp - InstCombineShifts.cpp + InstCombineShifts.cpp InstCombineSimplifyDemanded.cpp InstCombineVectorOps.cpp ) -target_link_libraries(LLVMInstCombine - LLVMAnalysis - LLVMCore - LLVMTarget - LLVMTransformUtils - ) +target_link_libraries (LLVMInstCombine LLVMTransformUtils) diff --git a/lib/Transforms/Instrumentation/CMakeLists.txt b/lib/Transforms/Instrumentation/CMakeLists.txt index f5ad9c6961..128bf48978 100644 --- a/lib/Transforms/Instrumentation/CMakeLists.txt +++ b/lib/Transforms/Instrumentation/CMakeLists.txt @@ -3,9 +3,3 @@ add_llvm_library(LLVMInstrumentation OptimalEdgeProfiling.cpp ProfilingUtils.cpp ) - -target_link_libraries(LLVMInstrumentation - LLVMAnalysis - LLVMCore - LLVMTransformUtils - ) diff --git a/lib/Transforms/Scalar/CMakeLists.txt b/lib/Transforms/Scalar/CMakeLists.txt index 05825e7993..b7598eace5 100644 --- a/lib/Transforms/Scalar/CMakeLists.txt +++ b/lib/Transforms/Scalar/CMakeLists.txt @@ -32,10 +32,4 @@ add_llvm_library(LLVMScalarOpts TailRecursionElimination.cpp ) -target_link_libraries (LLVMScalarOpts - LLVMAnalysis - LLVMCore - LLVMInstCombine - LLVMTarget - LLVMTransformUtils - ) +target_link_libraries (LLVMScalarOpts LLVMTransformUtils) diff --git a/lib/Transforms/Utils/CMakeLists.txt b/lib/Transforms/Utils/CMakeLists.txt index f10a72710e..61cbeb2bd3 100644 --- a/lib/Transforms/Utils/CMakeLists.txt +++ b/lib/Transforms/Utils/CMakeLists.txt @@ -25,9 +25,4 @@ add_llvm_library(LLVMTransformUtils ValueMapper.cpp ) -target_link_libraries(LLVMTransformUtils - LLVMAnalysis - LLVMCore - LLVMTarget - LLVMipa - ) +target_link_libraries (LLVMTransformUtils LLVMSupport) |