Skip to content

Fix GIT_SUBMODULE mode for nested submodule (fixes #395) #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbsheth merged 1 commit into from
Jul 12, 2021
Merged

Fix GIT_SUBMODULE mode for nested submodule (fixes #395) #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 28 additions & 9 deletions cmake/modules/hunter_pack_git_submodule.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,34 @@ function(hunter_pack_git_submodule)

set(top_git_directory "${output}")

set(cmd "${git_executable}" submodule status "${x_GIT_SUBMODULE}")
set(submodule_dir "${top_git_directory}/${x_GIT_SUBMODULE}")
if(NOT EXISTS "${submodule_dir}")
hunter_internal_error("Directory not exist: '${submodule_dir}'")
endif()

set(cmd "${git_executable}" rev-parse --show-toplevel)
execute_process(
COMMAND ${cmd}
WORKING_DIRECTORY "${top_git_directory}"
WORKING_DIRECTORY "${submodule_dir}/../"
RESULT_VARIABLE result
OUTPUT_VARIABLE output
ERROR_VARIABLE error
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE
)

if(NOT result EQUAL "0")
hunter_internal_error(
"Command failed: ${cmd} (${result}, ${output}, ${error})"
)
endif()

set(parent_git_directory "${output}")

set(cmd "${git_executable}" submodule status "${submodule_dir}")
execute_process(
COMMAND ${cmd}
WORKING_DIRECTORY "${parent_git_directory}"
RESULT_VARIABLE result
OUTPUT_VARIABLE output
ERROR_VARIABLE error
Expand All @@ -60,24 +84,19 @@ function(hunter_pack_git_submodule)
string(REPLACE ";" " " cmd "${cmd}")
hunter_internal_error(
"Command failed: '${cmd}' (${result}, ${output}, ${error})"
"To reproduce error go to '${top_git_directory}' and"
"To reproduce error go to '${parent_git_directory}' and"
"run command '${cmd}'"
)
endif()

set(submodule_file "${top_git_directory}/.gitmodules")
set(submodule_file "${parent_git_directory}/.gitmodules")
if(NOT EXISTS "${submodule_file}")
hunter_internal_error("File not found: '${submodule_file}'")
endif()
set_property(
DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${submodule_file}"
)

set(submodule_dir "${top_git_directory}/${x_GIT_SUBMODULE}")
if(NOT EXISTS "${submodule_dir}")
hunter_internal_error("Directory not exist: '${submodule_dir}'")
endif()

set(cmd "${git_executable}" status --porcelain)
execute_process(
COMMAND ${cmd}
Expand Down