summaryrefslogtreecommitdiff
path: root/quackle.pro
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 /quackle.pro
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 'quackle.pro')
-rw-r--r--quackle.pro8
1 files changed, 5 insertions, 3 deletions
diff --git a/quackle.pro b/quackle.pro
index 2c9a0c3..5631b6b 100644
--- a/quackle.pro
+++ b/quackle.pro
@@ -17,11 +17,9 @@ release {
DESTDIR = lib/release
}
-QMAKE_CXXFLAGS += -std=c++11
-
# enable/disable debug symbols
#CONFIG += debug staticlib
-CONFIG += release staticlib
+CONFIG += release staticlib c++14
CONFIG -= x11
# Input
@@ -38,3 +36,7 @@ macx {
CONFIG += x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
}
+
+linux { # old unixes/Qt distribs running around...most notably on Travis-CI
+ QMAKE_CXXFLAGS += -std=c++1y
+}