Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 14:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow empty sha for add_commit_sha

Browse Source
This commit is contained in:
Thomas Krijnen
2025-01-17 13:57:14 +01:00
parent 7ee055f4f3
commit 84420a8973
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+9 -2
View File
@@ -1148,6 +1148,7 @@ if(ADD_COMMIT_SHA)
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 -a --contains HEAD COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE git_branches OUTPUT_VARIABLE git_branches
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
@@ -1164,13 +1165,19 @@ if(ADD_COMMIT_SHA)
endif() endif()
execute_process( execute_process(
COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE git_sha OUTPUT_VARIABLE git_sha
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
message(STATUS "IfcOpenShell branch: \"${git_branch}\"") message(STATUS "IfcOpenShell branch: \"${git_branch}\"")
message(STATUS "IfcOpenShell commit: \"${git_sha}\"") message(STATUS "IfcOpenShell commit: \"${git_sha}\"")
if ("${git_branch}" STREQUAL "" OR "${git_sha}" STREQUAL "")
message(FATAL_ERROR "Unable to determine commit sha and/or branch")
endif()
add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch}) add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha}) add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
endif() endif()