Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions cmake/AddRepo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@

include_guard(GLOBAL)

set(ALP_GIT_SUBMODULE_JOBS "8" CACHE STRING
"Maximum number of parallel Git submodule clone jobs")
if(NOT ALP_GIT_SUBMODULE_JOBS MATCHES "^[1-9][0-9]*$")
message(FATAL_ERROR
"[alp/git] ALP_GIT_SUBMODULE_JOBS must be a positive integer; "
"got '${ALP_GIT_SUBMODULE_JOBS}'.")
endif()

function(_alp_add_repo_fail name repo_dir revision operation diagnostic)
string(STRIP "${diagnostic}" _diagnostic)
if(_diagnostic STREQUAL "")
Expand Down Expand Up @@ -149,7 +157,8 @@ function(_alp_add_repo_prepare_submodules name repo_dir revision checkout_perfor
message(STATUS "[alp/git] ${name}: updating recursive submodules from local objects in '${repo_dir}'.")
execute_process(
COMMAND "${GIT_EXECUTABLE}" -c protocol.file.allow=always submodule update
--init --recursive --checkout --depth 1 --no-fetch
--init --recursive --checkout --depth 1
--jobs "${ALP_GIT_SUBMODULE_JOBS}" --no-fetch
WORKING_DIRECTORY "${repo_dir}"
RESULT_VARIABLE _local_result
OUTPUT_VARIABLE _output
Expand All @@ -159,7 +168,8 @@ function(_alp_add_repo_prepare_submodules name repo_dir revision checkout_perfor
message(STATUS "[alp/git] ${name}: fetching missing recursive submodule revisions in '${repo_dir}'.")
execute_process(
COMMAND "${GIT_EXECUTABLE}" -c protocol.file.allow=always submodule update
--init --recursive --checkout --depth 1
--init --recursive --checkout --force --depth 1
--jobs "${ALP_GIT_SUBMODULE_JOBS}"
WORKING_DIRECTORY "${repo_dir}"
RESULT_VARIABLE _update_result
OUTPUT_VARIABLE _output
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ set(LIBIGL_COPYLEFT_CORE ON)
set(LIBIGL_RESTRICTED_TRIANGLE ON)
alp_add_git_repository(libigl URL https://github.com/libigl/libigl.git COMMITISH v2.6.0)

alp_add_git_repository(radix URL https://github.com/AlpineMapsOrg/radix.git COMMITISH 2ce3484513b826bb11e5433f868b048eaffe3e5d NOT_SYSTEM)
alp_add_git_repository(radix URL https://github.com/AlpineMapsOrg/radix.git COMMITISH bbe25429b3d19f78cea9f8e4aa4b6f618d2dfee5 NOT_SYSTEM)

set(ALP_CLI_COMPONENT_OPTIONS
ALP_BUILD_SF_MERGER
Expand Down