mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-24 16:04:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-master-to-taglib2

Browse Source 
# Conflicts:
#	ConfigureChecks.cmake
#	taglib/CMakeLists.txt
#	taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
#	taglib/toolkit/tfilestream.cpp
This commit is contained in:
Tsuda Kageyu
2017-06-09 11:11:44 +09:00
parent bd4a45b07e 662f340f93
commit 10e8866fec
14 changed files with 215 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -6,6 +6,8 @@ os:
- linux
- osx
dist: trusty
compiler:
- gcc
- clang
@ -25,5 +27,4 @@ matrix:
install:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cppunit; fi
script: cmake -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_BINDINGS=ON . && make && make check
script: cmake -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_BINDINGS=ON -DCMAKE_CXX_FLAGS="-std=c++11" . && make && make check