Travis: Fixed git version info output
(cherry picked from commit 03917c79cdecb906912d9a94ac5ccdaecc8f62e1)
This commit is contained in:
1 parent
4c3db96715
commit
cd7537e1f4
2 files changed
+2
-1
No files matched your search
@@ -16,6 +16,7 @@ before_install:
|
||||
- sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libzmq3-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;'
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in new issue
Block a user