Skip to content

Commit

Permalink
Travis: Fixed git version info output
Browse files Browse the repository at this point in the history
(cherry picked from commit 03917c7)
  • Loading branch information
Shauren committed Apr 9, 2016
1 parent b197163 commit 6a8e926
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -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;'
Expand Down
2 changes: 1 addition & 1 deletion cmake/genrev.cmake
Expand Up @@ -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
Expand Down

0 comments on commit 6a8e926

Please sign in to comment.