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

llvm-svn: 113632

11 files changed, 27 insertions, 22 deletions

diff --git a/llvm/examples/BrainF/CMakeLists.txt b/llvm/examples/BrainF/CMakeLists.txt
index 7bec105cdc8..4859634ed13 100644
--- a/llvm/examples/BrainF/CMakeLists.txt
+++ b/llvm/examples/BrainF/CMakeLists.txt
@@ -1,6 +1,7 @@
-set(LLVM_LINK_COMPONENTS jit bitwriter nativecodegen interpreter)
-
 add_llvm_example(BrainF
   BrainF.cpp
   BrainFDriver.cpp
   )
+
+add_llvm_link_components(BrainF jit nativecodegen interpreter)
+target_link_libraries(BrainF LLVMBitWriter)
diff --git a/llvm/examples/ExceptionDemo/CMakeLists.txt b/llvm/examples/ExceptionDemo/CMakeLists.txt
index d6619155684..293c66b2298 100644
--- a/llvm/examples/ExceptionDemo/CMakeLists.txt
+++ b/llvm/examples/ExceptionDemo/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(LLVM_LINK_COMPONENTS jit nativecodegen)
-
 add_llvm_example(ExceptionDemo
   ExceptionDemo.cpp
   )
+
+add_llvm_link_components(ExceptionDemo jit nativecodegen)
diff --git a/llvm/examples/Fibonacci/CMakeLists.txt b/llvm/examples/Fibonacci/CMakeLists.txt
index 693761241fc..7b8c3ea9040 100644
--- a/llvm/examples/Fibonacci/CMakeLists.txt
+++ b/llvm/examples/Fibonacci/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(LLVM_LINK_COMPONENTS jit interpreter nativecodegen)
-
 add_llvm_example(Fibonacci
   fibonacci.cpp
   )
+
+add_llvm_link_components(Fibonacci jit interpreter nativecodegen)
diff --git a/llvm/examples/HowToUseJIT/CMakeLists.txt b/llvm/examples/HowToUseJIT/CMakeLists.txt
index 428b53ffb9b..672af144d69 100644
--- a/llvm/examples/HowToUseJIT/CMakeLists.txt
+++ b/llvm/examples/HowToUseJIT/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(LLVM_LINK_COMPONENTS jit interpreter nativecodegen)
-
 add_llvm_example(HowToUseJIT
   HowToUseJIT.cpp
   )
+
+add_llvm_link_components(HowToUseJIT jit interpreter nativecodegen)
diff --git a/llvm/examples/Kaleidoscope/Chapter3/CMakeLists.txt b/llvm/examples/Kaleidoscope/Chapter3/CMakeLists.txt
index 1af8db00a17..059d7f6d5b0 100644
--- a/llvm/examples/Kaleidoscope/Chapter3/CMakeLists.txt
+++ b/llvm/examples/Kaleidoscope/Chapter3/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(LLVM_LINK_COMPONENTS core)
-
 add_llvm_example(Kaleidoscope-Ch3
   toy.cpp
   )
+
+target_link_libraries(Kaleidoscope-Ch3 LLVMCore)
diff --git a/llvm/examples/Kaleidoscope/Chapter4/CMakeLists.txt b/llvm/examples/Kaleidoscope/Chapter4/CMakeLists.txt
index 0d1ac533f02..7aa18b88988 100644
--- a/llvm/examples/Kaleidoscope/Chapter4/CMakeLists.txt
+++ b/llvm/examples/Kaleidoscope/Chapter4/CMakeLists.txt
@@ -1,5 +1,6 @@
-set(LLVM_LINK_COMPONENTS core jit interpreter native)
-
 add_llvm_example(Kaleidoscope-Ch4
   toy.cpp
   )
+
+add_llvm_link_components(Kaleidoscope-Ch4 jit interpreter native)
+target_link_libraries(Kaleidoscope-Ch4 LLVMCore)
diff --git a/llvm/examples/Kaleidoscope/Chapter5/CMakeLists.txt b/llvm/examples/Kaleidoscope/Chapter5/CMakeLists.txt
index 2d75ad35923..33a0651f8c0 100644
--- a/llvm/examples/Kaleidoscope/Chapter5/CMakeLists.txt
+++ b/llvm/examples/Kaleidoscope/Chapter5/CMakeLists.txt
@@ -1,5 +1,6 @@
-set(LLVM_LINK_COMPONENTS core jit interpreter native)
-
 add_llvm_example(Kaleidoscope-Ch5
   toy.cpp
   )
+
+add_llvm_link_components(Kaleidoscope-Ch5 jit interpreter native)
+target_link_libraries(Kaleidoscope-Ch5 LLVMCore)
diff --git a/llvm/examples/Kaleidoscope/Chapter6/CMakeLists.txt b/llvm/examples/Kaleidoscope/Chapter6/CMakeLists.txt
index 2e15a5f7dfc..002e0d4670b 100644
--- a/llvm/examples/Kaleidoscope/Chapter6/CMakeLists.txt
+++ b/llvm/examples/Kaleidoscope/Chapter6/CMakeLists.txt
@@ -1,5 +1,6 @@
-set(LLVM_LINK_COMPONENTS core jit interpreter native)
-
 add_llvm_example(Kaleidoscope-Ch6
   toy.cpp
   )
+
+add_llvm_link_components(Kaleidoscope-Ch6 jit interpreter native)
+target_link_libraries(Kaleidoscope-Ch6 LLVMCore)
diff --git a/llvm/examples/Kaleidoscope/Chapter7/CMakeLists.txt b/llvm/examples/Kaleidoscope/Chapter7/CMakeLists.txt
index 9b8227c6934..3c4ac17d93e 100644
--- a/llvm/examples/Kaleidoscope/Chapter7/CMakeLists.txt
+++ b/llvm/examples/Kaleidoscope/Chapter7/CMakeLists.txt
@@ -1,5 +1,6 @@
-set(LLVM_LINK_COMPONENTS core jit interpreter native)
-
 add_llvm_example(Kaleidoscope-Ch7
   toy.cpp
   )
+
+add_llvm_link_components(Kaleidoscope-Ch7 jit interpreter native)
+target_link_libraries(Kaleidoscope-Ch7 LLVMCore)
diff --git a/llvm/examples/ModuleMaker/CMakeLists.txt b/llvm/examples/ModuleMaker/CMakeLists.txt
index 81e911560bd..735942d775d 100644
--- a/llvm/examples/ModuleMaker/CMakeLists.txt
+++ b/llvm/examples/ModuleMaker/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(LLVM_LINK_COMPONENTS bitwriter)
-
 add_llvm_example(ModuleMaker
   ModuleMaker.cpp
   )
+
+target_link_libraries(ModuleMaker LLVMBitWriter LLVMCore)
diff --git a/llvm/examples/ParallelJIT/CMakeLists.txt b/llvm/examples/ParallelJIT/CMakeLists.txt
index fbdc6e5fc10..91ac5ef4675 100644
--- a/llvm/examples/ParallelJIT/CMakeLists.txt
+++ b/llvm/examples/ParallelJIT/CMakeLists.txt
@@ -1,9 +1,9 @@
-set(LLVM_LINK_COMPONENTS jit interpreter nativecodegen)
-
 add_llvm_example(ParallelJIT
   ParallelJIT.cpp
   )
 
+add_llvm_link_components(ParallelJIT jit interpreter nativecodegen)
+
 if(HAVE_LIBPTHREAD)
   target_link_libraries(ParallelJIT pthread)
 endif(HAVE_LIBPTHREAD)