summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/bugpoint/CMakeLists.txt19
-rw-r--r--tools/llc/CMakeLists.txt13
-rw-r--r--tools/lli/CMakeLists.txt14
-rw-r--r--tools/llvm-ar/CMakeLists.txt5
-rw-r--r--tools/llvm-as/CMakeLists.txt7
-rw-r--r--tools/llvm-bcanalyzer/CMakeLists.txt5
-rw-r--r--tools/llvm-c-test/CMakeLists.txt9
-rw-r--r--tools/llvm-diff/CMakeLists.txt6
-rw-r--r--tools/llvm-dis/CMakeLists.txt6
-rw-r--r--tools/llvm-dwarfdump/CMakeLists.txt1
-rw-r--r--tools/llvm-extract/CMakeLists.txt8
-rw-r--r--tools/llvm-link/CMakeLists.txt8
-rw-r--r--tools/llvm-lto/CMakeLists.txt8
-rw-r--r--tools/llvm-mc/CMakeLists.txt7
-rw-r--r--tools/llvm-nm/CMakeLists.txt7
-rw-r--r--tools/llvm-objdump/CMakeLists.txt3
-rw-r--r--tools/llvm-readobj/CMakeLists.txt5
-rw-r--r--tools/llvm-rtdyld/CMakeLists.txt7
-rw-r--r--tools/llvm-size/CMakeLists.txt5
-rw-r--r--tools/llvm-stress/CMakeLists.txt6
-rw-r--r--tools/llvm-symbolizer/CMakeLists.txt1
-rw-r--r--tools/lto/CMakeLists.txt6
-rw-r--r--tools/macho-dump/CMakeLists.txt5
-rw-r--r--tools/obj2yaml/CMakeLists.txt5
-rw-r--r--tools/opt/CMakeLists.txt19
-rw-r--r--tools/yaml2obj/CMakeLists.txt5
26 files changed, 163 insertions, 27 deletions
diff --git a/tools/bugpoint/CMakeLists.txt b/tools/bugpoint/CMakeLists.txt
index 0000d977ac..7e7ad0e94c 100644
--- a/tools/bugpoint/CMakeLists.txt
+++ b/tools/bugpoint/CMakeLists.txt
@@ -1,5 +1,20 @@
-set(LLVM_LINK_COMPONENTS asmparser instrumentation scalaropts ipo
- linker bitreader bitwriter irreader vectorize objcarcopts)
+set(LLVM_LINK_COMPONENTS
+ Analysis
+ BitWriter
+ Core
+ IPA
+ IPO
+ IRReader
+ InstCombine
+ Instrumentation
+ Linker
+ ObjCARCOpts
+ ScalarOpts
+ Support
+ Target
+ TransformUtils
+ Vectorize
+ )
add_llvm_tool(bugpoint
BugDriver.cpp
diff --git a/tools/llc/CMakeLists.txt b/tools/llc/CMakeLists.txt
index 97c762b7f6..9a3d411a28 100644
--- a/tools/llc/CMakeLists.txt
+++ b/tools/llc/CMakeLists.txt
@@ -1,4 +1,15 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser irreader)
+set(LLVM_LINK_COMPONENTS
+ ${LLVM_TARGETS_TO_BUILD}
+ AsmPrinter
+ CodeGen
+ Core
+ IRReader
+ MC
+ ScalarOpts
+ SelectionDAG
+ Support
+ Target
+ )
add_llvm_tool(llc
llc.cpp
diff --git a/tools/lli/CMakeLists.txt b/tools/lli/CMakeLists.txt
index 841a0ce42f..731b61a11b 100644
--- a/tools/lli/CMakeLists.txt
+++ b/tools/lli/CMakeLists.txt
@@ -1,6 +1,18 @@
add_subdirectory(ChildTarget)
-set(LLVM_LINK_COMPONENTS mcjit jit interpreter nativecodegen bitreader asmparser irreader selectiondag native instrumentation)
+set(LLVM_LINK_COMPONENTS
+ CodeGen
+ Core
+ ExecutionEngine
+ IRReader
+ Instrumentation
+ Interpreter
+ JIT
+ MCJIT
+ SelectionDAG
+ Support
+ native
+ )
if( LLVM_USE_OPROFILE )
set(LLVM_LINK_COMPONENTS
diff --git a/tools/llvm-ar/CMakeLists.txt b/tools/llvm-ar/CMakeLists.txt
index f15a1e2a86..857cf2d071 100644
--- a/tools/llvm-ar/CMakeLists.txt
+++ b/tools/llvm-ar/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS support object bitreader)
+set(LLVM_LINK_COMPONENTS
+ Object
+ Support
+ )
add_llvm_tool(llvm-ar
llvm-ar.cpp
diff --git a/tools/llvm-as/CMakeLists.txt b/tools/llvm-as/CMakeLists.txt
index d5620e7297..1b2789a4de 100644
--- a/tools/llvm-as/CMakeLists.txt
+++ b/tools/llvm-as/CMakeLists.txt
@@ -1,4 +1,9 @@
-set(LLVM_LINK_COMPONENTS asmparser bitwriter)
+set(LLVM_LINK_COMPONENTS
+ AsmParser
+ BitWriter
+ Core
+ Support
+ )
add_llvm_tool(llvm-as
llvm-as.cpp
diff --git a/tools/llvm-bcanalyzer/CMakeLists.txt b/tools/llvm-bcanalyzer/CMakeLists.txt
index 0151ea9b4f..369f469af8 100644
--- a/tools/llvm-bcanalyzer/CMakeLists.txt
+++ b/tools/llvm-bcanalyzer/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS bitreader)
+set(LLVM_LINK_COMPONENTS
+ BitReader
+ Support
+ )
add_llvm_tool(llvm-bcanalyzer
llvm-bcanalyzer.cpp
diff --git a/tools/llvm-c-test/CMakeLists.txt b/tools/llvm-c-test/CMakeLists.txt
index 2926d9dd34..13a072ae33 100644
--- a/tools/llvm-c-test/CMakeLists.txt
+++ b/tools/llvm-c-test/CMakeLists.txt
@@ -1,4 +1,11 @@
-set(LLVM_LINK_COMPONENTS all)
+set(LLVM_LINK_COMPONENTS
+ ${LLVM_TARGETS_TO_BUILD}
+ BitReader
+ Core
+ MCDisassembler
+ Object
+ Target
+ )
if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wstrict-prototypes")
diff --git a/tools/llvm-diff/CMakeLists.txt b/tools/llvm-diff/CMakeLists.txt
index 0df8b9ed79..4407a86c15 100644
--- a/tools/llvm-diff/CMakeLists.txt
+++ b/tools/llvm-diff/CMakeLists.txt
@@ -1,4 +1,8 @@
-set(LLVM_LINK_COMPONENTS support asmparser bitreader irreader)
+set(LLVM_LINK_COMPONENTS
+ Core
+ IRReader
+ Support
+ )
add_llvm_tool(llvm-diff
llvm-diff.cpp
diff --git a/tools/llvm-dis/CMakeLists.txt b/tools/llvm-dis/CMakeLists.txt
index 9f12ecb666..06ac051602 100644
--- a/tools/llvm-dis/CMakeLists.txt
+++ b/tools/llvm-dis/CMakeLists.txt
@@ -1,4 +1,8 @@
-set(LLVM_LINK_COMPONENTS bitreader analysis)
+set(LLVM_LINK_COMPONENTS
+ BitReader
+ Core
+ Support
+ )
add_llvm_tool(llvm-dis
llvm-dis.cpp
diff --git a/tools/llvm-dwarfdump/CMakeLists.txt b/tools/llvm-dwarfdump/CMakeLists.txt
index 05aad3f0b0..288b323701 100644
--- a/tools/llvm-dwarfdump/CMakeLists.txt
+++ b/tools/llvm-dwarfdump/CMakeLists.txt
@@ -1,6 +1,7 @@
set(LLVM_LINK_COMPONENTS
DebugInfo
Object
+ Support
)
add_llvm_tool(llvm-dwarfdump
diff --git a/tools/llvm-extract/CMakeLists.txt b/tools/llvm-extract/CMakeLists.txt
index 3163c4bbbd..c984f01034 100644
--- a/tools/llvm-extract/CMakeLists.txt
+++ b/tools/llvm-extract/CMakeLists.txt
@@ -1,4 +1,10 @@
-set(LLVM_LINK_COMPONENTS asmparser ipo bitreader bitwriter irreader)
+set(LLVM_LINK_COMPONENTS
+ BitWriter
+ Core
+ IPO
+ IRReader
+ Support
+ )
add_llvm_tool(llvm-extract
llvm-extract.cpp
diff --git a/tools/llvm-link/CMakeLists.txt b/tools/llvm-link/CMakeLists.txt
index 4df53564e1..d4f5be7490 100644
--- a/tools/llvm-link/CMakeLists.txt
+++ b/tools/llvm-link/CMakeLists.txt
@@ -1,4 +1,10 @@
-set(LLVM_LINK_COMPONENTS linker bitreader bitwriter asmparser irreader)
+set(LLVM_LINK_COMPONENTS
+ BitWriter
+ Core
+ IRReader
+ Linker
+ Support
+ )
add_llvm_tool(llvm-link
llvm-link.cpp
diff --git a/tools/llvm-lto/CMakeLists.txt b/tools/llvm-lto/CMakeLists.txt
index 348976cb81..485b03d26d 100644
--- a/tools/llvm-lto/CMakeLists.txt
+++ b/tools/llvm-lto/CMakeLists.txt
@@ -1,4 +1,10 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} lto support)
+set(LLVM_LINK_COMPONENTS
+ ${LLVM_TARGETS_TO_BUILD}
+ Core
+ LTO
+ MC
+ Support
+ )
add_llvm_tool(llvm-lto
llvm-lto.cpp
diff --git a/tools/llvm-mc/CMakeLists.txt b/tools/llvm-mc/CMakeLists.txt
index 805caf403a..6f8e9e5405 100644
--- a/tools/llvm-mc/CMakeLists.txt
+++ b/tools/llvm-mc/CMakeLists.txt
@@ -1,4 +1,9 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support MC MCParser MCDisassembler)
+set(LLVM_LINK_COMPONENTS
+ ${LLVM_TARGETS_TO_BUILD}
+ MC
+ MCParser
+ Support
+ )
add_llvm_tool(llvm-mc
llvm-mc.cpp
diff --git a/tools/llvm-nm/CMakeLists.txt b/tools/llvm-nm/CMakeLists.txt
index b1672ffe0b..ce758ced44 100644
--- a/tools/llvm-nm/CMakeLists.txt
+++ b/tools/llvm-nm/CMakeLists.txt
@@ -1,4 +1,9 @@
-set(LLVM_LINK_COMPONENTS bitreader object)
+set(LLVM_LINK_COMPONENTS
+ BitReader
+ Core
+ Object
+ Support
+ )
add_llvm_tool(llvm-nm
llvm-nm.cpp
diff --git a/tools/llvm-objdump/CMakeLists.txt b/tools/llvm-objdump/CMakeLists.txt
index e983ec92fb..413cb9bb1f 100644
--- a/tools/llvm-objdump/CMakeLists.txt
+++ b/tools/llvm-objdump/CMakeLists.txt
@@ -2,9 +2,8 @@ set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD}
DebugInfo
MC
- MCParser
- MCDisassembler
Object
+ Support
)
add_llvm_tool(llvm-objdump
diff --git a/tools/llvm-readobj/CMakeLists.txt b/tools/llvm-readobj/CMakeLists.txt
index 90997a8ba9..e67b970df6 100644
--- a/tools/llvm-readobj/CMakeLists.txt
+++ b/tools/llvm-readobj/CMakeLists.txt
@@ -1,7 +1,8 @@
set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD}
- bitreader
- object)
+ Object
+ Support
+ )
add_llvm_tool(llvm-readobj
llvm-readobj.cpp
diff --git a/tools/llvm-rtdyld/CMakeLists.txt b/tools/llvm-rtdyld/CMakeLists.txt
index 8d161d366d..3ad127fd73 100644
--- a/tools/llvm-rtdyld/CMakeLists.txt
+++ b/tools/llvm-rtdyld/CMakeLists.txt
@@ -1,4 +1,9 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support MC object RuntimeDyld JIT debuginfo)
+set(LLVM_LINK_COMPONENTS
+ DebugInfo
+ ExecutionEngine
+ RuntimeDyld
+ Support
+ )
add_llvm_tool(llvm-rtdyld
llvm-rtdyld.cpp
diff --git a/tools/llvm-size/CMakeLists.txt b/tools/llvm-size/CMakeLists.txt
index 933cc75c3f..60345739c3 100644
--- a/tools/llvm-size/CMakeLists.txt
+++ b/tools/llvm-size/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS object)
+set(LLVM_LINK_COMPONENTS
+ Object
+ Support
+ )
add_llvm_tool(llvm-size
llvm-size.cpp
diff --git a/tools/llvm-stress/CMakeLists.txt b/tools/llvm-stress/CMakeLists.txt
index ff3a5c42a0..106ced1419 100644
--- a/tools/llvm-stress/CMakeLists.txt
+++ b/tools/llvm-stress/CMakeLists.txt
@@ -1,4 +1,8 @@
-set(LLVM_LINK_COMPONENTS bitreader asmparser bitwriter instrumentation scalaropts ipo)
+set(LLVM_LINK_COMPONENTS
+ Core
+ IPA
+ Support
+ )
add_llvm_tool(llvm-stress
llvm-stress.cpp
diff --git a/tools/llvm-symbolizer/CMakeLists.txt b/tools/llvm-symbolizer/CMakeLists.txt
index 5967b891f4..9e76248d83 100644
--- a/tools/llvm-symbolizer/CMakeLists.txt
+++ b/tools/llvm-symbolizer/CMakeLists.txt
@@ -6,6 +6,7 @@
set(LLVM_LINK_COMPONENTS
DebugInfo
Object
+ Support
)
add_llvm_tool(llvm-symbolizer
diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt
index 957a9f0036..da0f6bfc1d 100644
--- a/tools/lto/CMakeLists.txt
+++ b/tools/lto/CMakeLists.txt
@@ -1,6 +1,10 @@
set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD}
- ipo scalaropts linker bitreader bitwriter lto mcdisassembler vectorize)
+ Core
+ LTO
+ MC
+ Support
+ )
add_definitions( -DLLVM_VERSION_INFO=\"${PACKAGE_VERSION}\" )
diff --git a/tools/macho-dump/CMakeLists.txt b/tools/macho-dump/CMakeLists.txt
index d55e1d5c41..bc2dfbf427 100644
--- a/tools/macho-dump/CMakeLists.txt
+++ b/tools/macho-dump/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support object)
+set(LLVM_LINK_COMPONENTS
+ Object
+ Support
+ )
add_llvm_tool(macho-dump
macho-dump.cpp
diff --git a/tools/obj2yaml/CMakeLists.txt b/tools/obj2yaml/CMakeLists.txt
index 6b39193e47..536c413460 100644
--- a/tools/obj2yaml/CMakeLists.txt
+++ b/tools/obj2yaml/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS object)
+set(LLVM_LINK_COMPONENTS
+ Object
+ Support
+ )
add_llvm_utility(obj2yaml
obj2yaml.cpp coff2yaml.cpp
diff --git a/tools/opt/CMakeLists.txt b/tools/opt/CMakeLists.txt
index 91959119e4..816edeae2d 100644
--- a/tools/opt/CMakeLists.txt
+++ b/tools/opt/CMakeLists.txt
@@ -1,4 +1,21 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser bitwriter irreader instrumentation scalaropts objcarcopts ipo vectorize)
+set(LLVM_LINK_COMPONENTS
+ ${LLVM_TARGETS_TO_BUILD}
+ Analysis
+ BitWriter
+ Core
+ IPA
+ IPO
+ IRReader
+ InstCombine
+ Instrumentation
+ MC
+ ObjCARCOpts
+ ScalarOpts
+ Support
+ Target
+ TransformUtils
+ Vectorize
+ )
add_llvm_tool(opt
AnalysisWrappers.cpp
diff --git a/tools/yaml2obj/CMakeLists.txt b/tools/yaml2obj/CMakeLists.txt
index 8d9d652246..3e2e4b1a25 100644
--- a/tools/yaml2obj/CMakeLists.txt
+++ b/tools/yaml2obj/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS object)
+set(LLVM_LINK_COMPONENTS
+ Object
+ Support
+ )
add_llvm_utility(yaml2obj
yaml2obj.cpp