diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-03-31 23:39:53 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-09 12:36:46 +0200 |
| commit | 6a8e926584b24fead0d2a4392a372e02c795407c (patch) | |
| tree | 4b8fe53d6756fca8eb29099e23f7bd9551081c0c | |
| parent | b197163a1d859897ca95af5c19637514ae5f615d (diff) | |
Travis: Fixed git version info output
(cherry picked from commit 03917c79cdecb906912d9a94ac5ccdaecc8f62e1)
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | cmake/genrev.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 894fedf4da6..232101229aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ before_install: - sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev - sudo apt-get -qq install libboost1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev libboost-iostreams1.55-dev - export CC=clang-3.5 CXX=clang++-3.5 + - git tag -a -m "Travis build" init install: - mysql -uroot -e 'create database test_mysql;' diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index 5c013756f09..d123153e975 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -24,7 +24,7 @@ else() if(GIT_EXECUTABLE) # Create a revision-string that we can use execute_process( - COMMAND "${GIT_EXECUTABLE}" describe --match init --dirty=+ --abbrev=12 + COMMAND "${GIT_EXECUTABLE}" describe --long --match init --dirty=+ --abbrev=12 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE rev_info OUTPUT_STRIP_TRAILING_WHITESPACE |