diff options
| author | David Blaikie <dblaikie@gmail.com> | 2012-07-31 20:29:59 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2012-07-31 20:29:59 +0000 |
| commit | 0bc35e9e484ca66323f437a205baaa52d777260f (patch) | |
| tree | d20afc215ca60a53553822e52073893504731d42 | |
| parent | 98499013bd70ec584f4c01c45106ec3e8203f16c (diff) | |
| download | clang-0bc35e9e484ca66323f437a205baaa52d777260f.tar.gz clang-0bc35e9e484ca66323f437a205baaa52d777260f.tar.bz2 clang-0bc35e9e484ca66323f437a205baaa52d777260f.tar.xz | |
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
| -rw-r--r-- | tools/c-index-test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/c-index-test/Makefile | 3 | ||||
| -rw-r--r-- | tools/clang-check/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tools/clang-check/Makefile | 1 | ||||
| -rw-r--r-- | tools/diagtool/CMakeLists.txt | 3 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt index 743268cb51..afe49ed6a7 100644 --- 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 284844fd0c..932dbb2d16 100644 --- 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 9db8f1a552..0a49e4fe9b 100644 --- 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 49b1ada95b..0a60a19438 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 77f5f381be..bdf12edfc0 100644 --- 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) |