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

cmake/git: tweak submodule detection logic (#5118)

Browse source 
This removes an incomplete check in cmake git-submodule detection
logic, directly using filepath probing instead. As a direct usecase,
it fixes submodule building for https://github.com/prove-rs/z3.rs.
This commit is contained in:
Luca Bruno 2021-03-22 23:10:17 +00:00 committed by GitHub
parent 67e419d20d
commit 119c5a995b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/git_utils.cmake
View file

@ -36,10 +36,7 @@ function(add_git_dir_dependency GIT_DOT_FILE SUCCESS_VAR)
if (NOT EXISTS "${GIT_COMMON_DIR_FILE}") if (NOT EXISTS "${GIT_COMMON_DIR_FILE}")
get_filename_component(GIT_WORKTREE_PARENT "${GIT_WORKTREE_DIR}" DIRECTORY) get_filename_component(GIT_WORKTREE_PARENT "${GIT_WORKTREE_DIR}" DIRECTORY)
get_filename_component(GIT_WORKTREE_PARENT "${GIT_WORKTREE_PARENT}" NAME) get_filename_component(GIT_WORKTREE_PARENT "${GIT_WORKTREE_PARENT}" NAME)
if(NOT EXISTS ${SUBMODULE_DIR_NAME}) if (EXISTS "${Z3_SOURCE_DIR}/${GIT_HEAD_FILE}" AND EXISTS "${Z3_SOURCE_DIR}/${GIT_WORKTREE_DIR}")
set(SUBMODULE_DIR_NAME modules)
endif()
if ("${GIT_WORKTREE_PARENT}" STREQUAL "${SUBMODULE_DIR_NAME}")
# Z3 is a git submodule # Z3 is a git submodule
set(GIT_HEAD_FILE "${Z3_SOURCE_DIR}/${GIT_HEAD_FILE}") set(GIT_HEAD_FILE "${Z3_SOURCE_DIR}/${GIT_HEAD_FILE}")
set(GIT_DIR "${Z3_SOURCE_DIR}/${GIT_WORKTREE_DIR}") set(GIT_DIR "${Z3_SOURCE_DIR}/${GIT_WORKTREE_DIR}")