[llvm-commits] [llvm] r75755 - in /llvm/trunk: cmake/modules/LLVMConfig.cmake tools/llvm-config/llvm-config.in.in

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jul 15 02:43:34 2009
New Revision: 75755

URL: http://llvm.org/viewvc/llvm-project?rev=75755&view=rev
Log:
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. :(

Modified:
    llvm/trunk/cmake/modules/LLVMConfig.cmake
    llvm/trunk/tools/llvm-config/llvm-config.in.in

Modified: llvm/trunk/cmake/modules/LLVMConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMConfig.cmake?rev=75755&r1=75754&r2=75755&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/LLVMConfig.cmake (original)
+++ llvm/trunk/cmake/modules/LLVMConfig.cmake Wed Jul 15 02:43:34 2009
@@ -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)

Modified: llvm/trunk/tools/llvm-config/llvm-config.in.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/llvm-config.in.in?rev=75755&r1=75754&r2=75755&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-config/llvm-config.in.in (original)
+++ llvm/trunk/tools/llvm-config/llvm-config.in.in Wed Jul 15 02:43:34 2009
@@ -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]]
         }
     }