Include clang-check as part of the clang installation.
This also tidies up a couple of other tools we were (partially) installing:
* c-index-test was being installed but shouldn't be (it's just a clang-dev tool)
* diagtool was being installed in cmake but not make (& shouldn't be installed in either)
Review by Manuel Klimek, Doug Gregor, and Chandler Carruth.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161073 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt
index 743268c..afe49ed 100644
--- a/tools/c-index-test/CMakeLists.txt
+++ b/tools/c-index-test/CMakeLists.txt
@@ -14,5 +14,3 @@
set_target_properties(c-index-test
PROPERTIES
LINKER_LANGUAGE CXX)
-
-install(TARGETS c-index-test RUNTIME DESTINATION bin)
diff --git a/tools/c-index-test/Makefile b/tools/c-index-test/Makefile
index 284844f..932dbb2 100644
--- a/tools/c-index-test/Makefile
+++ b/tools/c-index-test/Makefile
@@ -17,6 +17,9 @@
# No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
+# Don't install this. It is used for tests.
+NO_INSTALL = 1
+
LINK_COMPONENTS := support mc
USEDLIBS = clang.a clangFrontend.a clangDriver.a \
clangTooling.a \
diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt
index 9db8f1a..0a49e4f 100644
--- a/tools/clang-check/CMakeLists.txt
+++ b/tools/clang-check/CMakeLists.txt
@@ -6,3 +6,6 @@
clangTooling
clangBasic
)
+
+install(TARGETS clang-check
+ RUNTIME DESTINATION bin)
diff --git a/tools/clang-check/Makefile b/tools/clang-check/Makefile
index 49b1ada..0a60a19 100644
--- a/tools/clang-check/Makefile
+++ b/tools/clang-check/Makefile
@@ -10,7 +10,6 @@
CLANG_LEVEL := ../..
TOOLNAME = clang-check
-NO_INSTALL = 1
# No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt
index 77f5f38..bdf12ed 100644
--- a/tools/diagtool/CMakeLists.txt
+++ b/tools/diagtool/CMakeLists.txt
@@ -27,6 +27,3 @@
else()
set(CLANGXX_LINK_OR_COPY copy)
endif()
-
-install(TARGETS diagtool
- RUNTIME DESTINATION bin)
