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 /quackleio/quackleio.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 'quackleio/quackleio.pro')
| -rw-r--r-- | quackleio/quackleio.pro | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro index bd46a01..215e66b 100644 --- a/quackleio/quackleio.pro +++ b/quackleio/quackleio.pro @@ -17,11 +17,12 @@ MOC_DIR = moc # enable/disable debug symbols #CONFIG += debug staticlib -CONFIG += release staticlib +CONFIG += release staticlib c++14 CONFIG -= x11 -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 HEADERS += *.h @@ -29,10 +30,14 @@ HEADERS += *.h SOURCES += *.cpp macx { - CONFIG += x86 + CONFIG += x86 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 } unix:!macx { QMAKE_CXXFLAGS += -Wno-unused-local-typedefs } + +linux { # old unixes/Qt distribs running around...most notably on Travis-CI + QMAKE_CXXFLAGS += -std=c++1y +} |