[llvm-commits] [llvm] r136603 - /llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt

Chandler Carruth chandlerc at gmail.com
Sun Jul 31 15:00:40 PDT 2011


Author: chandlerc
Date: Sun Jul 31 17:00:40 2011
New Revision: 136603

URL: http://llvm.org/viewvc/llvm-project?rev=136603&view=rev
Log:
I mis-interpreted the MCDisassembler's intended dependencies. Now to fix
them properly. Specifically, the disassembler clearly attempts to
initialiaze all TargetInfo, MCTargeDesc, AsmParser, and Disassembler
sublibraries of registered targets. This makes the CMakeLists accurately
reflect this intent in the code.

This should fix the last of the link errors that I have gotten reports
of on OS X, but if anyone continues to see link errors, continue to
pester me and I'll look into it.

Modified:
    llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt

Modified: llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt?rev=136603&r1=136602&r2=136603&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt (original)
+++ llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt Sun Jul 31 17:00:40 2011
@@ -15,9 +15,16 @@
 
 foreach(t ${LLVM_TARGETS_TO_BUILD})
   set(td ${LLVM_MAIN_SRC_DIR}/lib/Target/${t})
+  if(EXISTS ${td}/TargetInfo/CMakeLists.txt)
+    add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Info")
+  endif()
+  if(EXISTS ${td}/MCTargetDesc/CMakeLists.txt)
+    add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Desc")
+  endif()
+  if(EXISTS ${td}/AsmParser/CMakeLists.txt)
+    add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}AsmParser")
+  endif()
   if(EXISTS ${td}/Disassembler/CMakeLists.txt)
     add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Disassembler")
-  elseif(EXISTS ${td}/TargetInfo/CMakeLists.txt)
-    add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Info")
   endif()
 endforeach(t)





More information about the llvm-commits mailing list