commit 8cca8f98bbe7589818a9f944a345b5699854c01f
author Daniel Dunbar <daniel@zuster.org> Wed Jul 15 07:43:34 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Wed Jul 15 07:43:34 2009 +0000
tree 1ca7226f01c6bfc2b11aa73a2bdb3e3c6a3a2721
parent f23d4930bdd5ee00354883f8756388573fa43e88

Teach Makefiles & CMake to link in the <TARGET>Info library when linking the
TARGET component.
 - Also, updated some CMake library dependencies, it is still missing some
   though. :(


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75755 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/LLVMConfig.cmake

diff --git a/cmake/modules/LLVMConfig.cmake b/cmake/modules/LLVMConfig.cmake
index 5fa08a3..9bcb02d 100755
--- a/cmake/modules/LLVMConfig.cmake
+++ b/cmake/modules/LLVMConfig.cmake
@@ -65,6 +65,7 @@
   foreach(c ${link_components})
     # add codegen/asmprinter
     list(FIND LLVM_TARGETS_TO_BUILD ${c} idx)
+    list(APPEND expanded_components "LLVM${c}Info")
     if( NOT idx LESS 0 )
       list(FIND llvm_libs "LLVM${c}CodeGen" idx)
       if( NOT idx LESS 0 )
@@ -192,3 +193,17 @@
 set(MSVC_LIB_DEPS_LLVMTransformUtils LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMipa)
 set(MSVC_LIB_DEPS_LLVMipa LLVMAnalysis LLVMCore LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMipo LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMTransformUtils LLVMipa)
+set(MSVC_LIB_DEPS_LLVMARMInfo LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMAlphaInfo LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMCBackendInfo LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMCellSPUInfo LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMCppBackendInfo LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMIA64Info LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMMSILInfo LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMMSP430Info LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMMipsInfo LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMPIC16Info LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMPowerPCInfo LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMSparcInfo LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMX86Info LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMXCoreInfo LLVMSupport)

tools/llvm-config/llvm-config.in.in

diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in
index 10a13b6..303bffb 100644
--- a/tools/llvm-config/llvm-config.in.in
+++ b/tools/llvm-config/llvm-config.in.in
@@ -333,7 +333,12 @@
     foreach my $target (@TARGETS_BUILT) {
         # FIXME: Temporary, until we don't switch all targets
         if (defined $NAME_MAP{$target.'asmprinter'}) {
-            $NAME_MAP{$target} = [$target.'asmprinter', $target.'codegen']
+            $NAME_MAP{$target} = [$target.'info',
+                                  $target.'asmprinter', 
+                                  $target.'codegen']
+        } else {
+            $NAME_MAP{$target} = [$target.'info',
+                                  $NAME_MAP{$target}[0]]
         }
     }