[patch] Fix build with x.0.0 versions of llvm

kdevelop-22.12.3-findclang.patch (text/plain), 1.57 KB, created by Chris Pfuhl on 2023-03-21 18:12:40 UTC

diff --git a/cmake/modules/FindClang.cmake b/cmake/modules/FindClang.cmake
index 89f4c9f..711c9ea 100644
--- a/cmake/modules/FindClang.cmake
+++ b/cmake/modules/FindClang.cmake
@@ -93,10 +93,12 @@ if(CLANG_FOUND)
   set(CLANG_VERSION ${LLVM_VERSION})
 
   # svn version of clang has a svn suffix "8.0.0svn" but installs the header in "8.0.0", without the suffix
-  string(REPLACE "svn" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}")
+  string(REGEX REPLACE "(svn).*$" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}")
   # dito for git
-  string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}")
+  string(REGEX REPLACE "(git).*$" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}")
 
+  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}")
+  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}")
   find_path(CLANG_BUILTIN_DIR
             # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator
             NAMES "cpuid.h"
@@ -106,6 +108,10 @@ if(CLANG_FOUND)
                           "../../../clang/${CLANG_VERSION}/include"
                           "clang/${CLANG_VERSION_CLEAN}/include"
                           "../../../clang/${CLANG_VERSION_CLEAN}/include"
+                          "clang/${CLANG_VERSION_STRIPPED}/include"
+                          "../../../clang/${CLANG_VERSION_STRIPPED}/include"
+                          "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
+                          "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
             NO_DEFAULT_PATH
   )