Revert "CMake: Get rid of LLVMLibDeps.cmake and export the libraries normally."

This reverts commit r113632

Conflicts:

	cmake/modules/AddLLVM.cmake

llvm-svn: 113819

8 files changed, 3 insertions, 43 deletions

diff --git a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt
index 1fa6022a464..9ba7c0125d7 100644
--- a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Target/ARM/AsmPrinter/CMakeLists.txt b/llvm/lib/Target/ARM/AsmPrinter/CMakeLists.txt
index da4dd8e6067..18645c0864a 100644
--- a/llvm/lib/Target/ARM/AsmPrinter/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Target/ARM/CMakeLists.txt b/llvm/lib/Target/ARM/CMakeLists.txt
index 7b0ee2b7e20..c381067b863 100644
--- a/llvm/lib/Target/ARM/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Target/CMakeLists.txt b/llvm/lib/Target/CMakeLists.txt
index 242b52f6399..43ebdac528c 100644
--- a/llvm/lib/Target/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Target/X86/AsmParser/CMakeLists.txt b/llvm/lib/Target/X86/AsmParser/CMakeLists.txt
index 897db3a957b..40dbdd72faa 100644
--- a/llvm/lib/Target/X86/AsmParser/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Target/X86/AsmPrinter/CMakeLists.txt b/llvm/lib/Target/X86/AsmPrinter/CMakeLists.txt
index 71ee884cc36..033973eeeff 100644
--- a/llvm/lib/Target/X86/AsmPrinter/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Target/X86/CMakeLists.txt b/llvm/lib/Target/X86/CMakeLists.txt
index f4e03316446..e9399f5c832 100644
--- a/llvm/lib/Target/X86/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Target/X86/Disassembler/CMakeLists.txt b/llvm/lib/Target/X86/Disassembler/CMakeLists.txt
index 91411f3e9fb..97589c00515 100644
--- a/llvm/lib/Target/X86/Disassembler/CMakeLists.txt
+++ b/llvm/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)