[llvm] r301650 - CMake: ignore git stderr when trying to sort out revision. NFC.
Tim Northover via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 28 09:06:01 PDT 2017
Author: tnorthover
Date: Fri Apr 28 11:06:00 2017
New Revision: 301650
URL: http://llvm.org/viewvc/llvm-project?rev=301650&view=rev
Log:
CMake: ignore git stderr when trying to sort out revision. NFC.
Modified:
llvm/trunk/cmake/modules/VersionFromVCS.cmake
llvm/trunk/include/llvm/Support/CMakeLists.txt
Modified: llvm/trunk/cmake/modules/VersionFromVCS.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/VersionFromVCS.cmake?rev=301650&r1=301649&r2=301650&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/VersionFromVCS.cmake (original)
+++ llvm/trunk/cmake/modules/VersionFromVCS.cmake Fri Apr 28 11:06:00 2017
@@ -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)
Modified: llvm/trunk/include/llvm/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CMakeLists.txt?rev=301650&r1=301649&r2=301650&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/CMakeLists.txt (original)
+++ llvm/trunk/include/llvm/Support/CMakeLists.txt Fri Apr 28 11:06:00 2017
@@ -14,7 +14,8 @@ macro(find_first_existing_vc_file out_va
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")
More information about the llvm-commits
mailing list