diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-21 07:25:11 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-21 07:25:11 -0800 |
| commit | 762a08915c252e0604b466dc97d5e51b0a86562d (patch) | |
| tree | cf0dce1cf4cd33a9b2493f31123554d2ec043a30 | |
| parent | 0e3b7a5962fa77a5b27e9875bd47dc13dab6c79e (diff) | |
| parent | b094d761aa3fd6021ddadae2dd6e715efc4ac246 (diff) | |
Merge remote-tracking branch 'michaelld/fix_version_info'
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index bafd0a7326..dceac67bab 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -41,7 +41,13 @@ if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) else() - set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}.x-xxx-xunknown") + if(NOT GR_GIT_COUNT) + set(GR_GIT_COUNT "compat-xxx") + endif() + if(NOT GR_GIT_HASH) + set(GR_GIT_HASH "xunknown") + endif() + set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}-${GR_GIT_COUNT}-${GR_GIT_HASH}") endif() ######################################################################## |