Tweak CMakeLists not for libclang to depend on the variable CLANG_TOOL_EXTRA_BUILD.

llvm-svn: 262606
GitOrigin-RevId: dd30704201579a3fe8e2c3fa84ff175d6159d5d6

tools/CMakeLists.txt

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 510bc44..d734493 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -7,7 +7,6 @@
 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 @@
 # 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)

tools/libclang/CMakeLists.txt

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index 5af5930..630be12 100644
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -47,7 +47,7 @@
   list(APPEND LIBS clangARCMigrate)
 endif ()
 
-if (CLANG_TOOL_EXTRA_BUILD)
+if (TARGET clangTidyPlugin)
   add_definitions(-DCLANG_TOOL_EXTRA_BUILD)
   list(APPEND LIBS clangTidyPlugin)
 endif ()