summaryrefslogtreecommitdiff
path: root/encodeleaves
diff options
context:
space:
mode:
authorJohn Fultz <jfultz@wolfram.com>2017-08-10 00:08:04 -0500
committerJohn Fultz <jfultz@wolfram.com>2017-08-10 02:33:13 -0500
commitb3672501e03144a7ad56e6751694697a0d23e240 (patch)
treeb3c68a8c7a1a224318f47f174eae2070564e3f03 /encodeleaves
parent3bfacc90fb3152384e1a4ae8894265fc8d966a56 (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 'encodeleaves')
-rw-r--r--encodeleaves/encodeleaves.pro7
1 files changed, 6 insertions, 1 deletions
diff --git a/encodeleaves/encodeleaves.pro b/encodeleaves/encodeleaves.pro
index 559df28..bd8808e 100644
--- a/encodeleaves/encodeleaves.pro
+++ b/encodeleaves/encodeleaves.pro
@@ -5,8 +5,9 @@ INCLUDEPATH += . ..
# enable/disable debug symbols
# CONFIG += debug
CONFIG += release
+CONFIG -= debug
-CONFIG += console
+CONFIG += console c++14
CONFIG -= app_bundle
debug {
@@ -33,3 +34,7 @@ SOURCES += encodeleaves.cpp
macx-g++ {
QMAKE_CXXFLAGS += -fpermissive
}
+
+linux { # old unixes/Qt distribs running around...most notably on Travis-CI
+ QMAKE_CXXFLAGS += -std=c++1y
+}