diff options
| author | Tim Northover <tnorthover@apple.com> | 2017-04-28 16:06:00 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2017-04-28 16:06:00 +0000 |
| commit | 65e448422cd62c7ab4584291e141533ade73c799 (patch) | |
| tree | 5f864d0a46f15dc3adca345af163e29ecb35c2b0 /llvm | |
| parent | 919f9e8d65ada6552b8b8a5ec12ea49db91c922a (diff) | |
| download | bcm5719-llvm-65e448422cd62c7ab4584291e141533ade73c799.tar.gz bcm5719-llvm-65e448422cd62c7ab4584291e141533ade73c799.zip | |
CMake: ignore git stderr when trying to sort out revision. NFC.
llvm-svn: 301650
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/cmake/modules/VersionFromVCS.cmake | 3 | ||||
| -rw-r--r-- | llvm/include/llvm/Support/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/llvm/cmake/modules/VersionFromVCS.cmake b/llvm/cmake/modules/VersionFromVCS.cmake index 983b48fefa0..a2ff4c0776a 100644 --- a/llvm/cmake/modules/VersionFromVCS.cmake +++ b/llvm/cmake/modules/VersionFromVCS.cmake @@ -45,7 +45,8 @@ function(add_version_info_from_vcs VERS) WORKING_DIRECTORY ${SOURCE_DIR} TIMEOUT 5 RESULT_VARIABLE git_result - OUTPUT_VARIABLE git_output) + OUTPUT_VARIABLE git_output + ERROR_QUIET) if( git_result EQUAL 0 ) string(REGEX MATCH "URL: ([^ \n]*)" svn_url ${git_output}) if(svn_url) diff --git a/llvm/include/llvm/Support/CMakeLists.txt b/llvm/include/llvm/Support/CMakeLists.txt index 825052171cd..c58ccf21630 100644 --- a/llvm/include/llvm/Support/CMakeLists.txt +++ b/llvm/include/llvm/Support/CMakeLists.txt @@ -14,7 +14,8 @@ macro(find_first_existing_vc_file out_var path) execute_process(COMMAND ${git_executable} rev-parse --git-dir WORKING_DIRECTORY ${path}/cmake RESULT_VARIABLE git_result - OUTPUT_VARIABLE git_dir) + OUTPUT_VARIABLE git_dir + ERROR_QUIET) if(git_result EQUAL 0) string(STRIP "${git_dir}" git_dir) set(${out_var} "${git_dir}/logs/HEAD") |
