From 4a4c46fa00c591035bfc834723fd3f2aad8ecf6b Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Thu, 3 Mar 2016 11:09:43 +0000 Subject: [PATCH] Tweak CMakeLists not for libclang to depend on the variable CLANG_TOOL_EXTRA_BUILD. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@262606 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/CMakeLists.txt | 4 +++- tools/libclang/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 510bc44f40..d734493c61 100644 --- a/tools/CMakeLists.txt +++ b/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/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt index 5af5930043..630be12466 100644 --- a/tools/libclang/CMakeLists.txt +++ b/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 () -- 2.40.0