From 42c900962434d4c6427090fd4a073b09977d479a Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Thu, 29 Jun 2017 07:44:50 +0200
Subject: [PATCH] Added support for future known llvm releases

---
 cmake_modules/FindLibClang.cmake | 18 ++++++++----------
 src/config.cc                    |  2 +-
 src/debug_lldb.cc                |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cmake_modules/FindLibClang.cmake b/cmake_modules/FindLibClang.cmake
index c8b6815..30e4c23 100644
--- a/cmake_modules/FindLibClang.cmake
+++ b/cmake_modules/FindLibClang.cmake
@@ -14,22 +14,20 @@
 #               Known LLVM release numbers.
 
 # most recent versions come first
-set(LIBCLANG_KNOWN_LLVM_VERSIONS 4.0.0_1 4.0.0
-  4.0
+set(LIBCLANG_KNOWN_LLVM_VERSIONS 5.0.0 5.0
+  4.0.1
+  4.0.0_1 4.0.0 4.0
   3.9.1
-  3.9.0
-  3.9
+  3.9.0 3.9
   3.8.1
-  3.8.0
-  3.8
+  3.8.0 3.8
   3.7.1
   3.7
   3.6.2
   3.6.1
   3.6
   3.5.1
-  3.5.0                   #Arch Linux
-  3.5                     #LLVM Debian/Ubuntu packages from http://llvm.org/apt/
+  3.5.0 3.5
   3.4.2 3.4.1 3.4 3.3 3.2 3.1)
 
 set(libclang_llvm_header_search_paths)
@@ -65,7 +63,7 @@ endforeach()
 find_path(LIBCLANG_INCLUDE_DIR clang-c/Index.h
   PATHS ${libclang_llvm_header_search_paths}
   PATH_SUFFIXES LLVM/include #Windows package from http://llvm.org/releases/
-    llvm40/include llvm39/include llvm38/include llvm37/include llvm36/include # FreeBSD
+    llvm50/include llvm41/include llvm40/include llvm39/include llvm38/include llvm37/include llvm36/include # FreeBSD
   DOC "The path to the directory that contains clang-c/Index.h")
 
 # On Windows with MSVC, the import library uses the ".imp" file extension
@@ -79,7 +77,7 @@ endif()
 find_library(LIBCLANG_LIBRARY NAMES libclang.imp libclang clang
   PATHS ${libclang_llvm_lib_search_paths}
   PATH_SUFFIXES LLVM/lib #Windows package from http://llvm.org/releases/
-    llvm40/lib llvm39/lib llvm38/lib llvm37/lib llvm36/lib # FreeBSD
+    llvm50/lib llvm41/lib llvm40/lib llvm39/lib llvm38/lib llvm37/lib llvm36/lib # FreeBSD
   DOC "The file that corresponds to the libclang library.")
 
 get_filename_component(LIBCLANG_LIBRARY_DIR ${LIBCLANG_LIBRARY} PATH)
diff --git a/src/config.cc b/src/config.cc
index 8e00ad9..82f62fd 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -229,7 +229,7 @@ void Config::read(const boost::property_tree::ptree &cfg) {
 #ifdef __linux
   if(terminal.clang_format_command=="clang-format" &&
      !boost::filesystem::exists("/usr/bin/clang-format") && !boost::filesystem::exists("/usr/local/bin/clang-format")) {
-    auto versions={"4.0", "3.9", "3.8", "3.7", "3.6", "3.5"};
+    auto versions={"5.0", "5", "4.0", "4", "3.9", "3.8", "3.7", "3.6", "3.5"};
     for(auto &version: versions) {
       auto corrected_command=std::string("/usr/bin/clang-format-")+version;
       if(boost::filesystem::exists(corrected_command)) {
diff --git a/src/debug_lldb.cc b/src/debug_lldb.cc
index d88326c..c786eb8 100644
--- a/src/debug_lldb.cc
+++ b/src/debug_lldb.cc
@@ -40,7 +40,7 @@ Debug::LLDB::LLDB(): state(lldb::StateType::eStateInvalid), buffer_size(131072)
   if(!getenv("LLDB_DEBUGSERVER_PATH")) {
     std::string debug_server_path("/usr/bin/lldb-server");
     if(!boost::filesystem::exists(debug_server_path)) {
-      auto versions={"4.0", "3.9", "3.8", "3.7", "3.6", "3.5"};
+      auto versions={"5.0", "5", "4.0", "4", "3.9", "3.8", "3.7", "3.6", "3.5"};
       for(auto &version: versions) {
         auto corrected_debug_server_path=debug_server_path+'-'+version;
         if(boost::filesystem::exists(corrected_debug_server_path)) {