nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-13 12:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI Travis Disable GC_WANT_R for now

Browse Source 
.. c++11, 5.5.1, stdlib conflicts across dependencies
This commit is contained in:
Mark Liversedge
2016-04-13 09:47:32 +01:00
parent 00c32f58e2
commit 4b588f7170
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -100,7 +100,8 @@ before_script:
- sed -i "" "s|#\(DEFINES += GC_WANT_ROBOT.*\)|\1 |" src/gcconfig.pri
- sed -i "" "s|\(DEFINES += GC_VIDEO_NONE.*\)|#\1 |" src/gcconfig.pri
- sed -i "" "s|#\(DEFINES += GC_VIDEO_QUICKTIME.*\)|\1 |" src/gcconfig.pri
- sed -i "" "s|#\(DEFINES += GC_WANT_R.*\)|\1 |" src/gcconfig.pri
##Issues with c++11 and stdlib on travis and dependencies (e.g. plot3d)
##- sed -i "" "s|#\(DEFINES += GC_WANT_R.*\)|\1 |" src/gcconfig.pri
- echo "QMAKE_CFLAGS_RELEASE += -mmacosx-version-min=10.7 -arch x86_64" >> src/gcconfig.pri
- sed -i "" "s/__GC_GOOGLE_CALENDAR_CLIENT_SECRET__/"$GC_GOOGLE_CALENDAR_CLIENT_SECRET"/" src/Core/Secrets.h
- sed -i "" "s/__GC_STRAVA_CLIENT_SECRET__/"$GC_STRAVA_CLIENT_SECRET"/" src/Core/Secrets.h

1
src/src.pro
View File

@@ -70,7 +70,6 @@ lessThan(QT_MAJOR_VERSION, 5) {
## need mac extras and clang++ needs to know which stdlib to link with
QT += macextras webengine webenginecore webenginewidgets positioning
LIBS += -stdlib=libc++
} else {
QT += multimedia multimediawidgets