diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2018-06-04 21:05:54 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2018-06-04 21:05:54 -0400 |
| commit | 4d1efbbd1aa971401202bb1bd436742c57170980 (patch) | |
| tree | a3eb68d768223982546ee6bf35bd533b1e0905bc /cmake | |
| parent | 5f6625ebd476340745d578b08620dbe4d27d1a9b (diff) | |
| parent | 4a8bfd06e73d7f051f0b39e19e57616c7bbb8ad1 (diff) | |
Update upstream source from tag 'upstream/2.1.1+dfsg'
Update to upstream version '2.1.1+dfsg'
with Debian dir fae8a5463c58b9ee303cb04f24606a56a5a08fba
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Version.cmake | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 2f38df2..403a02f 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -1,7 +1,7 @@ cmake_minimum_required (VERSION 3.4) set (BARRIER_VERSION_MAJOR 2) -set (BARRIER_VERSION_MINOR 0) +set (BARRIER_VERSION_MINOR 1) set (BARRIER_VERSION_PATCH 0) # @@ -44,24 +44,24 @@ if (NOT DEFINED BARRIER_REVISION) if (DEFINED ENV{GIT_COMMIT}) string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION) else() - execute_process ( - COMMAND git rev-parse --short=8 HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE BARRIER_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) + find_program (GIT_BINARY git) + if (NOT GIT_BINARY STREQUAL "GIT_BINARY-NOTFOUND") + execute_process ( + COMMAND git rev-parse --short=8 HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE BARRIER_REVISION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + endif() endif() endif() -if (DEFINED BARRIER_REVISION) - string(LENGTH ${BARRIER_REVISION} BARRIER_REVISION_LENGTH) - if (NOT ((BARRIER_REVISION MATCHES "^[a-f0-9]+") AND (BARRIER_REVISION_LENGTH EQUAL "8"))) - message (FATAL_ERROR "BARRIER_REVISION ('${BARRIER_REVISION}') should be a short commit hash") - endif() - unset (BARRIER_REVISION_LENGTH) -else() - set (BARRIER_REVISION "0badc0de") +string(LENGTH "${BARRIER_REVISION}" BARRIER_REVISION_LENGTH) +if (NOT BARRIER_REVISION_LENGTH EQUAL 8 OR NOT BARRIER_REVISION MATCHES "^[a-f0-9]+") + set (BARRIER_REVISION "00000000") + message (WARNING "revision not found. setting to ${BARRIER_REVISION}") endif() +unset (BARRIER_REVISION_LENGTH) if (DEFINED ENV{BUILD_NUMBER}) set (BARRIER_BUILD_NUMBER $ENV{BUILD_NUMBER}) |