diff options
| author | John Fultz <jfultz@wolfram.com> | 2017-08-10 00:08:04 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2017-08-10 02:33:13 -0500 |
| commit | b3672501e03144a7ad56e6751694697a0d23e240 (patch) | |
| tree | b3c68a8c7a1a224318f47f174eae2070564e3f03 /makegaddag/makegaddag.pro | |
| parent | 3bfacc90fb3152384e1a4ae8894265fc8d966a56 (diff) | |
Add OS X builds to Travis-CI.
Also, add a bit of parallelization, do a few other cleanups
on the yml and .pro files. And push C++14 flags everywhere
into the build system.
Diffstat (limited to 'makegaddag/makegaddag.pro')
| -rwxr-xr-x | makegaddag/makegaddag.pro | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/makegaddag/makegaddag.pro b/makegaddag/makegaddag.pro index b439383..1691ff2 100755 --- a/makegaddag/makegaddag.pro +++ b/makegaddag/makegaddag.pro @@ -2,6 +2,7 @@ TEMPLATE = app DEPENDPATH += .. ../quackleio INCLUDEPATH += . .. CONFIG += release +CONFIG -= debug debug { OBJECTS_DIR = obj/debug @@ -18,7 +19,7 @@ MOC_DIR = moc # enable/disable debug symbols # CONFIG += debug -CONFIG += console +CONFIG += console c++14 CONFIG -= app_bundle win32:!win32-g++ { @@ -27,8 +28,9 @@ win32:!win32-g++ { LIBS += -lquackleio -lquackle } -QMAKE_CXXFLAGS += -std=c++11 -QMAKE_CXXFLAGS:!win32-msvc2013 += -Wno-unknown-warning-option -Wno-deprecated-register +!msvc { + QMAKE_CXXFLAGS += -Wno-unknown-warning-option -Wno-deprecated-register +} # Input SOURCES += makegaddag.cpp @@ -45,3 +47,7 @@ win32 { macx-g++ { QMAKE_CXXFLAGS += -fpermissive } + +linux { # old unixes/Qt distribs running around...most notably on Travis-CI + QMAKE_CXXFLAGS += -std=c++1y +} |