updated, last on linux

Author: hongxuchen

cmake/FindLlvm.cmake

@@ -16,6 +16,29 @@ function(replace_compiler_option var old new)
   set( ${var} "${${var}}" PARENT_SCOPE )
 endfunction()
 
+macro (setup_package_version_variables _packageName)
+  if (DEFINED ${_packageName}_VERSION)
+    string (REGEX MATCHALL "[0-9]+" _versionComponents "${${_packageName}_VERSION}")
+    list (LENGTH _versionComponents _len)
+    if (${_len} GREATER 0)
+      list(GET _versionComponents 0 ${_packageName}_VERSION_MAJOR)
+    endif()
+    if (${_len} GREATER 1)
+      list(GET _versionComponents 1 ${_packageName}_VERSION_MINOR)
+    endif()
+    if (${_len} GREATER 2)
+      list(GET _versionComponents 2 ${_packageName}_VERSION_PATCH)
+    endif()
+    if (${_len} GREATER 3)
+      list(GET _versionComponents 3 ${_packageName}_VERSION_TWEAK)
+    endif()
+    set (${_packageName}_VERSION_COUNT ${_len})
+  else()
+    set (${_packageName}_VERSION_COUNT 0)
+    set (${_packageName}_VERSION "")
+  endif()
+endmacro()
+
 find_program(LLVM_CONFIG_EXECUTABLE llvm-config${LLVM_SUFFIX})
 
 execute_process(
@@ -81,7 +104,12 @@ execute_process(
   COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
   OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
   OUTPUT_STRIP_TRAILING_WHITESPACE
+  ERROR_QUIET
   )
+string(COMPARE EQUAL "${LLVM_SYSTEM_LIBS}" "" SYSTEM_LIBS_UNDEFINED)
+if(SYSTEM_LIBS_UNDEFINED)
+  set(LLVM_SYSTEM_LIBS "-lz -lpthread -ltinfo -ldl -lm")
+endif()
 
 execute_process(
   COMMAND ${LLVM_CONFIG_EXECUTABLE} --bindir

tooling/CMakeLists.txt

@@ -12,7 +12,7 @@ set(CLANG_LIBS
   -lclangSema
   -lclangEdit
   -lclangASTMatchers
-  -lclangRewrite
+  # -lclangRewrite
   -lclangRewriteFrontend
   -lclangStaticAnalyzerFrontend
   -lclangStaticAnalyzerCheckers
@@ -23,16 +23,16 @@ set(CLANG_LIBS
   )
 
 set(CLANG_TOOLS
-  ast
-  complex
-  clang_check
+  # ast
+  # complex
+  # clang_check
   cfe
-  rewrite1
-  rewrite2
-  rewrite3
-  tokens
-  toplevel_decls
-  try_matcher
+  # rewrite1
+  # rewrite2
+  # rewrite3
+  # tokens
+  # toplevel_decls
+  # try_matcher
   )
 foreach(TOOL ${CLANG_TOOLS})
   add_subdirectory(${TOOL})

tooling/cfe/main.cc

@@ -46,7 +46,7 @@ int main(int argc, char **argv) {
     return 1;
   }
   CI.getSourceManager().createMainFileID(pFile);
-  CI.getDiagnosticsClient().BeginSourceFile(CI.getLangOpts(), 0);
+  CI.getDiagnosticClient().BeginSourceFile(CI.getLangOpts(), 0);
   ParseAST(CI.getSema());
   // Print AST statistics
   CI.getASTContext().PrintStats();

tooling/tokens/main.cc

@@ -10,7 +10,7 @@ int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, "My tokenizer\n");
   CXIndex index = clang_createIndex(0, 0);
   const char *args[] = {"-I/usr/include", "-I."};
-  CXTranslationUnit translationUnit = clang_ parseTranslationUnit(
+  CXTranslationUnit translationUnit = clang_parseTranslationUnit(
       index, FileName.c_str(), 2, NULL, 0, CXTranslationUnit_None);
   CXFile file = clang_getFile(translationUnit, FileName.c_str());
   CXSourceLocation loc_start =