diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2016-03-03 11:09:43 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2016-03-03 11:09:43 +0000 |
| commit | dd30704201579a3fe8e2c3fa84ff175d6159d5d6 (patch) | |
| tree | bab564a117374003b377251f4745903691671d20 | |
| parent | c1f7f1a31f4cafdd17e09328c946e676ba2df144 (diff) | |
| download | bcm5719-llvm-dd30704201579a3fe8e2c3fa84ff175d6159d5d6.tar.gz bcm5719-llvm-dd30704201579a3fe8e2c3fa84ff175d6159d5d6.zip | |
Tweak CMakeLists not for libclang to depend on the variable CLANG_TOOL_EXTRA_BUILD.
llvm-svn: 262606
| -rw-r--r-- | clang/tools/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | clang/tools/libclang/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/clang/tools/CMakeLists.txt b/clang/tools/CMakeLists.txt index 510bc44f40c..d734493c619 100644 --- a/clang/tools/CMakeLists.txt +++ b/clang/tools/CMakeLists.txt @@ -7,7 +7,6 @@ add_clang_subdirectory(clang-format-vs) add_clang_subdirectory(clang-fuzzer) add_clang_subdirectory(c-index-test) -add_clang_subdirectory(libclang) if(CLANG_ENABLE_ARCMT) add_clang_subdirectory(arcmt-test) @@ -26,3 +25,6 @@ endif() # to keep the primary Clang repository small and focused. # It also may be included by LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR. add_llvm_external_project(clang-tools-extra extra) + +# libclang may require clang-tidy in clang-tools-extra. +add_clang_subdirectory(libclang) diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt index 5af5930043b..630be124660 100644 --- a/clang/tools/libclang/CMakeLists.txt +++ b/clang/tools/libclang/CMakeLists.txt @@ -47,7 +47,7 @@ if (CLANG_ENABLE_ARCMT) list(APPEND LIBS clangARCMigrate) endif () -if (CLANG_TOOL_EXTRA_BUILD) +if (TARGET clangTidyPlugin) add_definitions(-DCLANG_TOOL_EXTRA_BUILD) list(APPEND LIBS clangTidyPlugin) endif () |
