Merge pull request #4430 from Vogtinator/gitfix

cmake: Fix FindLibGit2.cmake with newer versions
ElektraInitiative · Aug 12, 2022 · 14d6500 · 14d6500
2 parents d57703b + e4d085f
commit 14d6500
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md
@@ -316,6 +316,7 @@ you up-to-date with the multi-language support provided by Elektra.
 
 ### CMake
 
+- Fix build with newer libgit2 versions _(Fabian Vogt)_
 - <<TODO>>
 - <<TODO>>
 - <<TODO>>

diff --git a/scripts/cmake/Modules/FindLibGit2.cmake b/scripts/cmake/Modules/FindLibGit2.cmake
@@ -15,7 +15,7 @@ find_file (LibGit2_VERSION_HEADER NAMES git2/version.h)
 if (NOT LibGit2_VERSION_HEADER STREQUAL LibGit2_VERSION_HEADER-NOTFOUND)
 	file (
 		STRINGS ${LibGit2_VERSION_HEADER} LibGit2_VERSION
-		REGEX "#define LIBGIT2_VERSION \".+\""
+		REGEX "#define LIBGIT2_VERSION[ \t]+\".+\""
 		LIMIT_COUNT 1)
 	string (REGEX REPLACE ".*\"(.+)\"" "\\1" LibGit2_VERSION ${LibGit2_VERSION})
 endif (NOT LibGit2_VERSION_HEADER STREQUAL LibGit2_VERSION_HEADER-NOTFOUND)