[cfe-commits] r161073 - in /cfe/trunk/tools: c-index-test/CMakeLists.txt c-index-test/Makefile clang-check/CMakeLists.txt clang-check/Makefile diagtool/CMakeLists.txt

[David Blaikie]

Author: dblaikie
Date: Tue Jul 31 15:29:59 2012
New Revision: 161073

URL: http://llvm.org/viewvc/llvm-project?rev=161073&view=rev
Log:
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.

Modified:
    cfe/trunk/tools/c-index-test/CMakeLists.txt
    cfe/trunk/tools/c-index-test/Makefile
    cfe/trunk/tools/clang-check/CMakeLists.txt
    cfe/trunk/tools/clang-check/Makefile
    cfe/trunk/tools/diagtool/CMakeLists.txt

Modified: cfe/trunk/tools/c-index-test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/CMakeLists.txt?rev=161073&r1=161072&r2=161073&view=diff
==============================================================================
--- cfe/trunk/tools/c-index-test/CMakeLists.txt (original)
+++ cfe/trunk/tools/c-index-test/CMakeLists.txt Tue Jul 31 15:29:59 2012
@@ -14,5 +14,3 @@
 set_target_properties(c-index-test
   PROPERTIES
   LINKER_LANGUAGE CXX)
-
-install(TARGETS c-index-test RUNTIME DESTINATION bin)

Modified: cfe/trunk/tools/c-index-test/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/Makefile?rev=161073&r1=161072&r2=161073&view=diff
==============================================================================
--- cfe/trunk/tools/c-index-test/Makefile (original)
+++ cfe/trunk/tools/c-index-test/Makefile Tue Jul 31 15:29:59 2012
@@ -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 \

Modified: cfe/trunk/tools/clang-check/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-check/CMakeLists.txt?rev=161073&r1=161072&r2=161073&view=diff
==============================================================================
--- cfe/trunk/tools/clang-check/CMakeLists.txt (original)
+++ cfe/trunk/tools/clang-check/CMakeLists.txt Tue Jul 31 15:29:59 2012
@@ -6,3 +6,6 @@
   clangTooling
   clangBasic
   )
+
+install(TARGETS clang-check
+  RUNTIME DESTINATION bin)

Modified: cfe/trunk/tools/clang-check/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-check/Makefile?rev=161073&r1=161072&r2=161073&view=diff
==============================================================================
--- cfe/trunk/tools/clang-check/Makefile (original)
+++ cfe/trunk/tools/clang-check/Makefile Tue Jul 31 15:29:59 2012
@@ -10,7 +10,6 @@
 CLANG_LEVEL := ../..
 
 TOOLNAME = clang-check
-NO_INSTALL = 1
 
 # No plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1

Modified: cfe/trunk/tools/diagtool/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/diagtool/CMakeLists.txt?rev=161073&r1=161072&r2=161073&view=diff
==============================================================================
--- cfe/trunk/tools/diagtool/CMakeLists.txt (original)
+++ cfe/trunk/tools/diagtool/CMakeLists.txt Tue Jul 31 15:29:59 2012
@@ -27,6 +27,3 @@
 else()
   set(CLANGXX_LINK_OR_COPY copy)
 endif()
-
-install(TARGETS diagtool 
-  RUNTIME DESTINATION bin)