fix cmake: use cmake provided git

commit_hash:13544a6adfa1dafdf66f0c5fe36c986099588828
userver-framework · Nov 14, 2024 · ddcdfad · ddcdfad
1 parent 38685ed
commit ddcdfad
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/.mapping.json b/.mapping.json
@@ -395,7 +395,6 @@
   "cmake/modules/FindBrotli.cmake":"taxi/uservices/userver/cmake/modules/FindBrotli.cmake",
   "cmake/modules/FindCrypto.cmake":"taxi/uservices/userver/cmake/modules/FindCrypto.cmake",
   "cmake/modules/FindCryptoPP.cmake":"taxi/uservices/userver/cmake/modules/FindCryptoPP.cmake",
-  "cmake/modules/FindGit.cmake":"taxi/uservices/userver/cmake/modules/FindGit.cmake",
   "cmake/modules/FindGrpcChannelz.cmake":"taxi/uservices/userver/cmake/modules/FindGrpcChannelz.cmake",
   "cmake/modules/FindGssApi.cmake":"taxi/uservices/userver/cmake/modules/FindGssApi.cmake",
   "cmake/modules/FindHiredis.cmake":"taxi/uservices/userver/cmake/modules/FindHiredis.cmake",

diff --git a/cmake/GetUserverVersion.cmake b/cmake/GetUserverVersion.cmake
@@ -6,7 +6,7 @@ find_package(Git)
 
 if(Git_FOUND)
   execute_process(
-    COMMAND ${Git_EXECUTABLE} rev-parse --short HEAD
+    COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     OUTPUT_VARIABLE USERVER_HASH
     RESULT_VARIABLE STATUS

diff --git a/cmake/modules/FindGit.cmake b/cmake/modules/FindGit.cmake