From e3bb2a0cdd81ec2527d12d4148bec02fcd947b95 Mon Sep 17 00:00:00 2001 From: Lennart Hannink Date: Tue, 5 Sep 2023 18:20:49 +0200 Subject: [PATCH] Fix git working dir for ORT_BUILD_INFO (fixes #17197) (#17198) ### Description Git commands producing `git-commid-id` and `git-branch` are always run in `CMAKE_CURRENT_SOURCE_DIR` (i.e. `onnxruntime/cmake`) ### Motivation and Context Please refer to corresponding issue [#17197](https://github.com/microsoft/onnxruntime/issues/17197). --- cmake/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 82a454791d..6e00fe6d9c 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -1336,9 +1336,11 @@ set(ORT_BUILD_INFO "ORT Build Info: ") find_package(Git) if (Git_FOUND) execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE ORT_GIT_COMMIT) string(STRIP "${ORT_GIT_COMMIT}" ORT_GIT_COMMIT) execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE ORT_GIT_BRANCH) string(STRIP "${ORT_GIT_BRANCH}" ORT_GIT_BRANCH) string(APPEND ORT_BUILD_INFO "git-branch=${ORT_GIT_BRANCH}, git-commit-id=${ORT_GIT_COMMIT}, ")