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 743268cb51a578acfad94c65eaec6557eaf9b694..afe49ed6a7cda2ac591fd8364810c38851482af7 100644 (file)
--- a/tools/c-index-test/CMakeLists.txt
+++ b/tools/c-index-test/CMakeLists.txt
@@ -14,5 +14,3 @@ target_link_libraries(c-index-test
 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 284844fd0c84142fb46ef2c93e60fb97343639ea..932dbb2d169e6cd0c6803184c27fd69f76633b88 100644 (file)
--- a/tools/c-index-test/Makefile
+++ b/tools/c-index-test/Makefile
@@ -17,6 +17,9 @@ INTERNAL_TOOL = 1
 # 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 9db8f1a55298a061dce0bf84148691bcd0143c24..0a49e4fe9b3999604c7fc1d32c0fa227e3da9f17 100644 (file)
--- a/tools/clang-check/CMakeLists.txt
+++ b/tools/clang-check/CMakeLists.txt
@@ -6,3 +6,6 @@ target_link_libraries(clang-check
   clangTooling
   clangBasic
   )
+
+install(TARGETS clang-check
+  RUNTIME DESTINATION bin)

diff --git a/tools/clang-check/Makefile b/tools/clang-check/Makefile
index 49b1ada95b93819f884f9bffcf26aa6ce9c69bfe..0a60a194381c6394f63c710e16cd4b5442d3a1ac 100644 (file)
--- 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 77f5f381bef6acc7e0876127a879680008073895..bdf12edfc08e50fdc771fb3018f59559c141a553 100644 (file)
--- a/tools/diagtool/CMakeLists.txt
+++ b/tools/diagtool/CMakeLists.txt
@@ -27,6 +27,3 @@ if(UNIX)
 else()
   set(CLANGXX_LINK_OR_COPY copy)
 endif()
-
-install(TARGETS diagtool 
-  RUNTIME DESTINATION bin)