Eliminate CIndexer::getClangPath(), since libclang no longer depends

on the presence of a 'clang' executable. Simplify
CIndexer::getClangResourcesPath() a bit.

Patch up the CMake makefiles to install headers into two locations in
the build tree, for those silly cases where 'clang' will end up
looking into the wrong build directory for headers.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116260 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 1 insertions, 4 deletions

diff --git a/tools/libclang/CIndexer.h b/tools/libclang/CIndexer.h
index 6ef8b40e03..89b098728d 100644
--- a/tools/libclang/CIndexer.h
+++ b/tools/libclang/CIndexer.h
@@ -31,7 +31,7 @@ class CIndexer {
   bool OnlyLocalDecls;
   bool DisplayDiagnostics;
 
-  llvm::sys::Path ClangPath;
+  llvm::sys::Path ResourcesPath;
   
 public:
  CIndexer() : OnlyLocalDecls(false), DisplayDiagnostics(false) { }
@@ -47,9 +47,6 @@ public:
     DisplayDiagnostics = Display;
   }
 
-  /// \brief Get the path of the clang binary.
-  const llvm::sys::Path& getClangPath();
-  
   /// \brief Get the path of the clang resource files.
   std::string getClangResourcesPath();
 };