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

Merge topic 'ExternalProject_VCS-quiet' 

2dad1c14 ExternalProject: Find VCS packages quietly
This commit is contained in:
Brad King 2014-04-10 09:53:07 -04:00 committed by CMake Topic Stage
parent c590889310 2dad1c143c
commit 2a326fa65f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/ExternalProject.cmake
View File

@ -1352,7 +1352,7 @@ function(_ep_add_download_command name)
if(cmd_set) if(cmd_set)
set(work_dir ${download_dir}) set(work_dir ${download_dir})
elseif(cvs_repository) elseif(cvs_repository)
find_package(CVS) find_package(CVS QUIET)
if(NOT CVS_EXECUTABLE) if(NOT CVS_EXECUTABLE)
message(FATAL_ERROR "error: could not find cvs for checkout of ${name}") message(FATAL_ERROR "error: could not find cvs for checkout of ${name}")
endif() endif()
@ -1379,7 +1379,7 @@ function(_ep_add_download_command name)
set(cmd ${CVS_EXECUTABLE} -d ${cvs_repository} -q co ${cvs_tag} -d ${src_name} ${cvs_module}) set(cmd ${CVS_EXECUTABLE} -d ${cvs_repository} -q co ${cvs_tag} -d ${src_name} ${cvs_module})
list(APPEND depends ${stamp_dir}/${name}-cvsinfo.txt) list(APPEND depends ${stamp_dir}/${name}-cvsinfo.txt)
elseif(svn_repository) elseif(svn_repository)
find_package(Subversion) find_package(Subversion QUIET)
if(NOT Subversion_SVN_EXECUTABLE) if(NOT Subversion_SVN_EXECUTABLE)
message(FATAL_ERROR "error: could not find svn for checkout of ${name}") message(FATAL_ERROR "error: could not find svn for checkout of ${name}")
endif() endif()
@ -1415,7 +1415,7 @@ function(_ep_add_download_command name)
--non-interactive ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name}) --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name})
list(APPEND depends ${stamp_dir}/${name}-svninfo.txt) list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
elseif(git_repository) elseif(git_repository)
find_package(Git) find_package(Git QUIET)
if(NOT GIT_EXECUTABLE) if(NOT GIT_EXECUTABLE)
message(FATAL_ERROR "error: could not find git for clone of ${name}") message(FATAL_ERROR "error: could not find git for clone of ${name}")
endif() endif()
@ -1463,7 +1463,7 @@ function(_ep_add_download_command name)
set(cmd ${CMAKE_COMMAND} -P ${tmp_dir}/${name}-gitclone.cmake) set(cmd ${CMAKE_COMMAND} -P ${tmp_dir}/${name}-gitclone.cmake)
list(APPEND depends ${stamp_dir}/${name}-gitinfo.txt) list(APPEND depends ${stamp_dir}/${name}-gitinfo.txt)
elseif(hg_repository) elseif(hg_repository)
find_package(Hg) find_package(Hg QUIET)
if(NOT HG_EXECUTABLE) if(NOT HG_EXECUTABLE)
message(FATAL_ERROR "error: could not find hg for clone of ${name}") message(FATAL_ERROR "error: could not find hg for clone of ${name}")
endif() endif()