From 2d1684bc2d2621c0d6b02b81168624388648049a Mon Sep 17 00:00:00 2001 From: Asger Gitz-Johansen Date: Sat, 23 Jan 2021 22:05:28 +0100 Subject: [PATCH] Added the SUBMODULE_DIR_NAME variable for better submodule support (#4959) * Added the CMAKE_MODULE_DIR_NAME variable for better submodule support * It should be called SUBMODULE_DIR_NAME instead --- cmake/git_utils.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/git_utils.cmake b/cmake/git_utils.cmake index ba14c5c2b..82d707194 100644 --- a/cmake/git_utils.cmake +++ b/cmake/git_utils.cmake @@ -36,7 +36,10 @@ function(add_git_dir_dependency GIT_DOT_FILE SUCCESS_VAR) 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_PARENT}" NAME) - if ("${GIT_WORKTREE_PARENT}" STREQUAL "modules") + if(NOT EXISTS ${SUBMODULE_DIR_NAME}) + set(SUBMODULE_DIR_NAME modules) + endif() + if ("${GIT_WORKTREE_PARENT}" STREQUAL "${SUBMODULE_DIR_NAME}") # Z3 is a git submodule set(GIT_HEAD_FILE "${Z3_SOURCE_DIR}/${GIT_HEAD_FILE}") set(GIT_DIR "${Z3_SOURCE_DIR}/${GIT_WORKTREE_DIR}")