mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-22 20:52:30 +00:00
fix ifcopenshell.version
This commit is contained in:
committed by
Thomas Krijnen
parent
c6090ef9b3
commit
d3aa2e87c9
@@ -897,7 +897,7 @@ find_package (Git)
|
|||||||
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
|
||||||
)
|
)
|
||||||
@@ -906,7 +906,8 @@ if (GIT_FOUND)
|
|||||||
string(REPLACE "*" "" git_branch_candidate_temp "${git_branch_candidate}")
|
string(REPLACE "*" "" git_branch_candidate_temp "${git_branch_candidate}")
|
||||||
string(STRIP "${git_branch_candidate_temp}" git_branch_candidate_2)
|
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()
|
||||||
execute_process(
|
execute_process(
|
||||||
|
|||||||
Reference in New Issue
Block a user