llvm dev - Jan 2010 - [LLVMdev] [PATCH] Add InstCombine to CMake.

Fixes build of bugpoint, llvm-ld and opt.

OK for commit?
---
 CMakeLists.txt                |    1 +
 tools/bugpoint/CMakeLists.txt |    2 +-
 tools/llvm-ld/CMakeLists.txt  |    2 +-
 tools/opt/CMakeLists.txt      |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bce039..0edd509 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,6 +295,7 @@ add_subdirectory(lib/CodeGen/AsmPrinter)
 add_subdirectory(lib/Bitcode/Reader)
 add_subdirectory(lib/Bitcode/Writer)
 add_subdirectory(lib/Transforms/Utils)
+add_subdirectory(lib/Transforms/InstCombine)
 add_subdirectory(lib/Transforms/Instrumentation)
 add_subdirectory(lib/Transforms/Scalar)
 add_subdirectory(lib/Transforms/IPO)
diff --git a/tools/bugpoint/CMakeLists.txt b/tools/bugpoint/CMakeLists.txt
index 90f24ba..fd32a68 100644
--- a/tools/bugpoint/CMakeLists.txt
+++ b/tools/bugpoint/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS asmparser instrumentation scalaropts ipo
+set(LLVM_LINK_COMPONENTS asmparser instcombine instrumentation scalaropts ipo
   linker bitreader bitwriter)
 set(LLVM_REQUIRES_EH 1)
 
diff --git a/tools/llvm-ld/CMakeLists.txt b/tools/llvm-ld/CMakeLists.txt
index 2ae4a1d..257d1e9 100644
--- a/tools/llvm-ld/CMakeLists.txt
+++ b/tools/llvm-ld/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS ipo scalaropts linker archive bitwriter)
+set(LLVM_LINK_COMPONENTS ipo scalaropts instcombine linker archive bitwriter)
 
 add_llvm_tool(llvm-ld
   Optimize.cpp
diff --git a/tools/opt/CMakeLists.txt b/tools/opt/CMakeLists.txt
index 0570d0e..912acfa 100644
--- a/tools/opt/CMakeLists.txt
+++ b/tools/opt/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS bitreader asmparser bitwriter instrumentation
scalaropts ipo)
+set(LLVM_LINK_COMPONENTS bitreader asmparser bitwriter instcombine
instrumentation scalaropts ipo)
 
 add_llvm_tool(opt
   AnalysisWrappers.cpp
-- 
1.6.5.3

> Fixes build of bugpoint, llvm-ld and opt.
>
> OK for commit?
Looks good for me

-- 
With best regards, Anton Korobeynikov
Faculty of Mathematics and Mechanics, Saint Petersburg State University

Tobias Grosser <grosser at fim.uni-passau.de> writes:
> Fixes build of bugpoint, llvm-ld and opt.
Douglas Gregor in r92519 introduced a fix that looks more correct to
me. Please check that it works for you (use a pristine build directory).a

Generally speaking, LLVM_LINK_COMPONENTS shouldn't be used for linking a
library when that library is an implicit dependence of other libraries
listed on that macro.

-- 
Óscar