mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 01:24:08 +00:00
Code Activity

CMake: Improve handling of git hash/describe (#7028)

Browse source 
Only check for and depend on the .git folder if requested.
Only warn about disabling when enabled.
Only add git hash to version if valid.
This commit is contained in:
Alexander Grund 2023-12-02 18:47:57 +01:00 committed by GitHub
parent a15a7cee7b
commit ed5ab54ab6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
CMakeLists.txt
View file

@ -41,19 +41,22 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
################################################################################ ################################################################################
include(${PROJECT_SOURCE_DIR}/cmake/git_utils.cmake) include(${PROJECT_SOURCE_DIR}/cmake/git_utils.cmake)
macro(disable_git_describe) macro(disable_git_describe)
message(WARNING "Disabling Z3_INCLUDE_GIT_DESCRIBE") if(Z3_INCLUDE_GIT_DESCRIBE)
set(Z3_INCLUDE_GIT_DESCRIBE OFF CACHE BOOL "Include git describe output in version output" FORCE) message(WARNING "Disabling Z3_INCLUDE_GIT_DESCRIBE")
set(Z3_INCLUDE_GIT_DESCRIBE OFF CACHE BOOL "Include git describe output in version output" FORCE)
endif()
endmacro() endmacro()
macro(disable_git_hash) macro(disable_git_hash)
message(WARNING "Disabling Z3_INCLUDE_GIT_HASH") if(Z3_INCLUDE_GIT_HASH)
set(Z3_INCLUDE_GIT_HASH OFF CACHE BOOL "Include git hash in version output" FORCE) message(WARNING "Disabling Z3_INCLUDE_GIT_HASH")
unset(Z3GITHASH) # Used in configure_file() set(Z3_INCLUDE_GIT_HASH OFF CACHE BOOL "Include git hash in version output" FORCE)
endif()
endmacro() endmacro()
option(Z3_INCLUDE_GIT_HASH "Include git hash in version output" ON) option(Z3_INCLUDE_GIT_HASH "Include git hash in version output" ON)
option(Z3_INCLUDE_GIT_DESCRIBE "Include git describe output in version output" ON) option(Z3_INCLUDE_GIT_DESCRIBE "Include git describe output in version output" ON)
set(GIT_DIR "${PROJECT_SOURCE_DIR}/.git") set(GIT_DIR "${PROJECT_SOURCE_DIR}/.git")
if (EXISTS "${GIT_DIR}") if ((Z3_INCLUDE_GIT_HASH OR Z3_INCLUDE_GIT_HASH) AND EXISTS "${GIT_DIR}")
# Try to make CMake configure depend on the current git HEAD so that # Try to make CMake configure depend on the current git HEAD so that
# a re-configure is triggered when the HEAD changes. # a re-configure is triggered when the HEAD changes.
add_git_dir_dependency("${GIT_DIR}" ADD_GIT_DEP_SUCCESS) add_git_dir_dependency("${GIT_DIR}" ADD_GIT_DEP_SUCCESS)
@ -63,13 +66,13 @@ if (EXISTS "${GIT_DIR}")
if (NOT Z3GITHASH) if (NOT Z3GITHASH)
message(WARNING "Failed to get Git hash") message(WARNING "Failed to get Git hash")
disable_git_hash() disable_git_hash()
else()
message(STATUS "Using Git hash in version output: ${Z3GITHASH}")
# This mimics the behaviour of the old build system.
set(Z3_FULL_VERSION_STR "${Z3_FULL_VERSION_STR} ${Z3GITHASH}")
endif() endif()
message(STATUS "Using Git hash in version output: ${Z3GITHASH}")
# This mimics the behaviour of the old build system.
set(Z3_FULL_VERSION_STR "${Z3_FULL_VERSION_STR} ${Z3GITHASH}")
else() else()
message(STATUS "Not using Git hash in version output") message(STATUS "Not using Git hash in version output")
unset(Z3GITHASH) # Used in configure_file()
endif() endif()
if (Z3_INCLUDE_GIT_DESCRIBE) if (Z3_INCLUDE_GIT_DESCRIBE)
get_git_head_describe("${GIT_DIR}" Z3_GIT_DESCRIPTION) get_git_head_describe("${GIT_DIR}" Z3_GIT_DESCRIPTION)
@ -93,6 +96,9 @@ else()
disable_git_describe() disable_git_describe()
disable_git_hash() disable_git_hash()
endif() endif()
if(NOT Z3_INCLUDE_GIT_HASH)
unset(Z3GITHASH) # Used in configure_file()
endif()
################################################################################ ################################################################################
# Useful CMake functions/Macros # Useful CMake functions/Macros