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

This reverts commit r113632

Conflicts:

	cmake/modules/AddLLVM.cmake

llvm-svn: 113819

5 files changed, 5 insertions, 34 deletions

diff --git a/llvm/lib/Transforms/IPO/CMakeLists.txt b/llvm/lib/Transforms/IPO/CMakeLists.txt
index b07d0947eda..65483e8fed6 100644
--- a/llvm/lib/Transforms/IPO/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Transforms/InstCombine/CMakeLists.txt b/llvm/lib/Transforms/InstCombine/CMakeLists.txt
index 4330377850a..5b1ff3e23bb 100644
--- a/llvm/lib/Transforms/InstCombine/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Transforms/Instrumentation/CMakeLists.txt b/llvm/lib/Transforms/Instrumentation/CMakeLists.txt
index f5ad9c69611..128bf489787 100644
--- a/llvm/lib/Transforms/Instrumentation/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Transforms/Scalar/CMakeLists.txt b/llvm/lib/Transforms/Scalar/CMakeLists.txt
index 05825e79939..b7598eace53 100644
--- a/llvm/lib/Transforms/Scalar/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt
index f10a72710e1..61cbeb2bd35 100644
--- a/llvm/lib/Transforms/Utils/CMakeLists.txt
+++ b/llvm/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)