Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-26 10:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: reset wrong fix on merge conflict

Browse Source
This commit is contained in:
Dirk Olbrich
2023-08-30 11:49:48 +02:00
committed by Thomas Krijnen
parent 2bb64a6cae
commit a3ecde3ad9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+6 -5
View File
@@ -985,17 +985,18 @@ if(ADD_COMMIT_SHA)
if(GIT_FOUND) if(GIT_FOUND)
message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}") message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
execute_process( execute_process(
COMMAND ${GIT_EXECUTABLE} branch --contains HEAD COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
OUTPUT_VARIABLE git_branches OUTPUT_VARIABLE git_branches
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
string(REPLACE "\n" ";" git_branch_list "${git_branches}") string(REPLACE "\n" ";" git_branch_list "${git_branches}")
foreach(git_branch_candidate IN ITEMS ${git_branch_list}) foreach(git_branch_candidate IN ITEMS ${git_branch_list})
string(STRIP "${git_branch_candidate}" git_branch_candidate_2) string(REPLACE "*" "" git_branch_candidate_temp "${git_branch_candidate}")
string(STRIP "${git_branch_candidate_temp}" git_branch_candidate_2)
if(NOT git_branch_candidate_2 MATCHES "^HEAD$") if (NOT git_branch_candidate_2 MATCHES "^HEAD$")
set(git_branch ${git_branch_candidate_2}) string(REPLACE "/" ";" git_branch_candidate_2_list "${git_branch_candidate_2}")
list(GET git_branch_candidate_2_list -1 git_branch)
endif() endif()
endforeach() endforeach()