[Cmake-commits] CMake branch, master, updated. v3.14.0-440-gf2d3e23
Kitware Robot
kwrobot at kitware.com
Wed Mar 20 11:43:03 EDT 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via f2d3e233cd2c2d2d623793e5178d9b8707c59e41 (commit)
via 8f723e48b8ee79909209ec27ab3a3c979983e34d (commit)
via bca0c162230f0391a7cc701922b69d44532b7ebc (commit)
from 23a84ac99006043338ce41bf68314e31ababf6dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2d3e233cd2c2d2d623793e5178d9b8707c59e41
commit f2d3e233cd2c2d2d623793e5178d9b8707c59e41
Merge: 23a84ac 8f723e4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 20 15:32:22 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 20 11:33:01 2019 -0400
Merge topic 'ExternalProject-optimize-vcs'
8f723e48b8 ExternalProject: Optimize Mercurial commands
bca0c16223 ExternalProject: Optimize git commands
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3116
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f723e48b8ee79909209ec27ab3a3c979983e34d
commit 8f723e48b8ee79909209ec27ab3a3c979983e34d
Author: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
AuthorDate: Tue Mar 19 14:59:23 2019 +0100
Commit: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
CommitDate: Tue Mar 19 15:17:55 2019 +0100
ExternalProject: Optimize Mercurial commands
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 777c721..948b921 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1167,18 +1167,12 @@ endif()
endfunction()
function(_ep_write_hgclone_script script_filename source_dir hg_EXECUTABLE hg_repository hg_tag src_name work_dir hgclone_infofile hgclone_stampfile)
+ if("${hg_tag}" STREQUAL "")
+ message(FATAL_ERROR "Tag for hg checkout should not be empty.")
+ endif()
file(WRITE ${script_filename}
-"if(\"${hg_tag}\" STREQUAL \"\")
- message(FATAL_ERROR \"Tag for hg checkout should not be empty.\")
-endif()
-
-set(run 0)
-
-if(\"${hgclone_infofile}\" IS_NEWER_THAN \"${hgclone_stampfile}\")
- set(run 1)
-endif()
-
-if(NOT run)
+"
+if(NOT \"${hgclone_infofile}\" IS_NEWER_THAN \"${hgclone_stampfile}\")
message(STATUS \"Avoiding repeated hg clone, stamp file is up to date: '${hgclone_stampfile}'\")
return()
endif()
@@ -1215,7 +1209,6 @@ execute_process(
COMMAND \${CMAKE_COMMAND} -E copy
\"${hgclone_infofile}\"
\"${hgclone_stampfile}\"
- WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
if(error_code)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bca0c162230f0391a7cc701922b69d44532b7ebc
commit bca0c162230f0391a7cc701922b69d44532b7ebc
Author: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
AuthorDate: Tue Mar 19 14:53:46 2019 +0100
Commit: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
CommitDate: Tue Mar 19 15:17:35 2019 +0100
ExternalProject: Optimize git commands
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 4344bdb..777c721 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1086,15 +1086,20 @@ function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git
if(NOT ${git_remote_name} STREQUAL "origin")
list(APPEND git_clone_options --origin \"${git_remote_name}\")
endif()
+
string (REPLACE ";" " " git_clone_options "${git_clone_options}")
- file(WRITE ${script_filename}
-"set(run 0)
-if(\"${gitclone_infofile}\" IS_NEWER_THAN \"${gitclone_stampfile}\")
- set(run 1)
-endif()
+ set(git_options)
+ # disable cert checking if explicitly told not to do it
+ if(NOT "x${tls_verify}" STREQUAL "x" AND NOT tls_verify)
+ set(git_options
+ -c http.sslVerify=false)
+ endif()
+ string (REPLACE ";" " " git_options "${git_options}")
-if(NOT run)
+ file(WRITE ${script_filename}
+"
+if(NOT \"${gitclone_infofile}\" IS_NEWER_THAN \"${gitclone_stampfile}\")
message(STATUS \"Avoiding repeated git clone, stamp file is up to date: '${gitclone_stampfile}'\")
return()
endif()
@@ -1107,21 +1112,12 @@ if(error_code)
message(FATAL_ERROR \"Failed to remove directory: '${source_dir}'\")
endif()
-set(git_options)
-
-# disable cert checking if explicitly told not to do it
-set(tls_verify \"${tls_verify}\")
-if(NOT \"x${tls_verify}\" STREQUAL \"x\" AND NOT tls_verify)
- list(APPEND git_options
- -c http.sslVerify=false)
-endif()
-
# try the clone 3 times in case there is an odd git clone issue
set(error_code 1)
set(number_of_tries 0)
while(error_code AND number_of_tries LESS 3)
execute_process(
- COMMAND \"${git_EXECUTABLE}\" \${git_options} clone ${git_clone_options} \"${git_repository}\" \"${src_name}\"
+ COMMAND \"${git_EXECUTABLE}\" ${git_options} clone ${git_clone_options} \"${git_repository}\" \"${src_name}\"
WORKING_DIRECTORY \"${work_dir}\"
RESULT_VARIABLE error_code
)
@@ -1136,7 +1132,7 @@ if(error_code)
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" \${git_options} checkout ${git_tag} ${git_checkout_explicit--}
+ COMMAND \"${git_EXECUTABLE}\" ${git_options} checkout ${git_tag} ${git_checkout_explicit--}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
@@ -1145,7 +1141,7 @@ if(error_code)
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" \${git_options} submodule update --recursive --init ${git_submodules}
+ COMMAND \"${git_EXECUTABLE}\" ${git_options} submodule update --recursive --init ${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
@@ -1159,7 +1155,6 @@ execute_process(
COMMAND \${CMAKE_COMMAND} -E copy
\"${gitclone_infofile}\"
\"${gitclone_stampfile}\"
- WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
if(error_code)
@@ -1234,16 +1229,16 @@ endfunction()
function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_remote_name git_submodules git_repository work_dir)
+ if("${git_tag}" STREQUAL "")
+ message(FATAL_ERROR "Tag for git checkout should not be empty.")
+ endif()
if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.6)
set(git_stash_save_options --all --quiet)
else()
set(git_stash_save_options --quiet)
endif()
file(WRITE ${script_filename}
-"if(\"${git_tag}\" STREQUAL \"\")
- message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
-endif()
-
+"
execute_process(
COMMAND \"${git_EXECUTABLE}\" rev-list --max-count=1 HEAD
WORKING_DIRECTORY \"${work_dir}\"
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 58 +++++++++++++++++--------------------------
1 file changed, 23 insertions(+), 35 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list