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 /gaddagize/gaddagize.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 'gaddagize/gaddagize.pro')
| -rwxr-xr-x | gaddagize/gaddagize.pro | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gaddagize/gaddagize.pro b/gaddagize/gaddagize.pro index 505c237..2915317 100755 --- a/gaddagize/gaddagize.pro +++ b/gaddagize/gaddagize.pro @@ -6,7 +6,7 @@ INCLUDEPATH += . .. # CONFIG += debug CONFIG += release -CONFIG += console +CONFIG += console c++14 CONFIG -= app_bundle debug { @@ -17,7 +17,9 @@ release { OBJECTS_DIR = obj/release } -QMAKE_CXXFLAGS:!win32-msvc2013 += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register +!msvc { + QMAKE_CXXFLAGS += -Wno-unknown-warning-option -Wno-deprecated-register +} # Input SOURCES += gaddagize.cpp @@ -26,3 +28,7 @@ SOURCES += gaddagize.cpp macx-g++ { QMAKE_CXXFLAGS += -fpermissive } + +linux { # old unixes/Qt distribs running around...most notably on Travis-CI + QMAKE_CXXFLAGS += -std=c++1y +} |