RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

Completely disable git/svn version checking if not needed.

Browse Source 
Working with git on a branch I find it really annoying that committing
a change causes ninja to think that stuff needs to be rebuilt.

With this change at least nothing in llvm needs to be rebuild when
something is committed.

llvm-svn: 306858
This commit is contained in:
Rafael Espindola 2017-06-30 18:48:33 +00:00
parent 4e3c0d7882
commit 444f6a8d61
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -206,7 +206,7 @@ endif()
include(VersionFromVCS) include(VersionFromVCS)
option(LLVM_APPEND_VC_REV option(LLVM_APPEND_VC_REV
"Append the version control system revision id to LLVM version" OFF) "Embed the version control system revision id in LLVM" ON)
if( LLVM_APPEND_VC_REV ) if( LLVM_APPEND_VC_REV )
add_version_info_from_vcs(PACKAGE_VERSION) add_version_info_from_vcs(PACKAGE_VERSION)

7
docs/CMake.rst
View File

@ -247,9 +247,10 @@ LLVM-specific variables
tests. tests.
**LLVM_APPEND_VC_REV**:BOOL **LLVM_APPEND_VC_REV**:BOOL
Append version control revision info (svn revision number or Git revision id) Embed version control revision info (svn revision number or Git revision id).
to LLVM version string (stored in the PACKAGE_VERSION macro). For this to work This is used among other things in the LLVM version string (stored in the
cmake must be invoked before the build. Defaults to OFF. PACKAGE_VERSION macro). For this to work cmake must be invoked before the
build. Defaults to ON.
**LLVM_ENABLE_THREADS**:BOOL **LLVM_ENABLE_THREADS**:BOOL
Build with threads support, if available. Defaults to ON. Build with threads support, if available. Defaults to ON.

38
include/llvm/Support/CMakeLists.txt
View File

@ -9,25 +9,27 @@ function(find_first_existing_file out_var)
endfunction() endfunction()
macro(find_first_existing_vc_file out_var path) macro(find_first_existing_vc_file out_var path)
find_program(git_executable NAMES git git.exe git.cmd) if ( LLVM_APPEND_VC_REV )
# Run from a subdirectory to force git to print an absolute path. find_program(git_executable NAMES git git.exe git.cmd)
execute_process(COMMAND ${git_executable} rev-parse --git-dir # Run from a subdirectory to force git to print an absolute path.
WORKING_DIRECTORY ${path}/cmake execute_process(COMMAND ${git_executable} rev-parse --git-dir
RESULT_VARIABLE git_result WORKING_DIRECTORY ${path}/cmake
OUTPUT_VARIABLE git_dir RESULT_VARIABLE git_result
ERROR_QUIET) OUTPUT_VARIABLE git_dir
if(git_result EQUAL 0) ERROR_QUIET)
string(STRIP "${git_dir}" git_dir) if(git_result EQUAL 0)
set(${out_var} "${git_dir}/logs/HEAD") string(STRIP "${git_dir}" git_dir)
# some branchless cases (e.g. 'repo') may not yet have .git/logs/HEAD set(${out_var} "${git_dir}/logs/HEAD")
if (NOT EXISTS "${git_dir}/logs/HEAD") # some branchless cases (e.g. 'repo') may not yet have .git/logs/HEAD
file(WRITE "${git_dir}/logs/HEAD" "") if (NOT EXISTS "${git_dir}/logs/HEAD")
file(WRITE "${git_dir}/logs/HEAD" "")
endif()
else()
find_first_existing_file(${out_var}
"${path}/.svn/wc.db" # SVN 1.7
"${path}/.svn/entries" # SVN 1.6
)
endif() endif()
else()
find_first_existing_file(${out_var}
"${path}/.svn/wc.db" # SVN 1.7
"${path}/.svn/entries" # SVN 1.6
)
endif() endif()
endmacro() endmacro()