diff options
| author | 2014-04-23 19:13:00 -0700 | |
|---|---|---|
| committer | 2014-04-23 19:13:00 -0700 | |
| commit | 80a040ac772132a8d8e7385c0261f545adc88aee (patch) | |
| tree | 682a57288e9f1fdde230b075e5ab354adc1b2c07 /externals/cmake-modules | |
| parent | updated windows scm_rev code to use new style (diff) | |
| download | yuzu-80a040ac772132a8d8e7385c0261f545adc88aee.tar.gz yuzu-80a040ac772132a8d8e7385c0261f545adc88aee.tar.xz yuzu-80a040ac772132a8d8e7385c0261f545adc88aee.zip | |
fixes to scm_rev generation to make it conistent with windows build
Diffstat (limited to 'externals/cmake-modules')
| -rw-r--r-- | externals/cmake-modules/GetGitRevisionDescription.cmake | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/externals/cmake-modules/GetGitRevisionDescription.cmake b/externals/cmake-modules/GetGitRevisionDescription.cmake index 2b9cde061..087f5deea 100644 --- a/externals/cmake-modules/GetGitRevisionDescription.cmake +++ b/externals/cmake-modules/GetGitRevisionDescription.cmake | |||
| @@ -80,6 +80,34 @@ function(get_git_head_revision _refspecvar _hashvar) | |||
| 80 | set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE) | 80 | set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE) |
| 81 | endfunction() | 81 | endfunction() |
| 82 | 82 | ||
| 83 | function(git_branch_name _var) | ||
| 84 | if(NOT GIT_FOUND) | ||
| 85 | find_package(Git QUIET) | ||
| 86 | endif() | ||
| 87 | |||
| 88 | if(NOT GIT_FOUND) | ||
| 89 | set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) | ||
| 90 | return() | ||
| 91 | endif() | ||
| 92 | |||
| 93 | execute_process(COMMAND | ||
| 94 | "${GIT_EXECUTABLE}" | ||
| 95 | rev-parse --abbrev-ref HEAD | ||
| 96 | WORKING_DIRECTORY | ||
| 97 | "${CMAKE_SOURCE_DIR}" | ||
| 98 | RESULT_VARIABLE | ||
| 99 | res | ||
| 100 | OUTPUT_VARIABLE | ||
| 101 | out | ||
| 102 | ERROR_QUIET | ||
| 103 | OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
| 104 | if(NOT res EQUAL 0) | ||
| 105 | set(out "${out}-${res}-NOTFOUND") | ||
| 106 | endif() | ||
| 107 | |||
| 108 | set(${_var} "${out}" PARENT_SCOPE) | ||
| 109 | endfunction() | ||
| 110 | |||
| 83 | function(git_describe _var) | 111 | function(git_describe _var) |
| 84 | if(NOT GIT_FOUND) | 112 | if(NOT GIT_FOUND) |
| 85 | find_package(Git QUIET) | 113 | find_package(Git QUIET) |