kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ExternalProject-git-recursive-init' 

79410eeb ExternalProject: Initialize Git submodules recursively and on update (#16083)
This commit is contained in:
Brad King 2016-05-03 10:17:02 -04:00 committed by CMake Topic Stage
parent 3fc49c50b0 79410eeb1f
commit e053510efa
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Help/release/dev/ExternalProject-git-recursive-init.rst Normal file
View File

@ -0,0 +1,7 @@
ExternalProject-git-recursive-init
----------------------------------
* The :module:`ExternalProject` module learned to initialize Git submodules
recursively and also to initialize new submodules on updates. Use the
``GIT_SUBMODULES`` option to restrict which submodules are initalized and
updated.

4
Modules/ExternalProject.cmake
View File

@ -587,7 +587,7 @@ if(error_code)
endif() endif()
execute_process( execute_process(
COMMAND \"${git_EXECUTABLE}\" \${git_options} submodule update --recursive ${git_submodules} COMMAND \"${git_EXECUTABLE}\" \${git_options} submodule update --recursive --init ${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\" WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code RESULT_VARIABLE error_code
) )
@ -833,7 +833,7 @@ if(error_code OR is_remote_ref OR NOT (\"\${tag_sha}\" STREQUAL \"\${head_sha}\"
endif() endif()
execute_process( execute_process(
COMMAND \"${git_EXECUTABLE}\" submodule update --recursive ${git_submodules} COMMAND \"${git_EXECUTABLE}\" submodule update --recursive --init ${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\" WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code RESULT_VARIABLE error_code
) )