From b3672501e03144a7ad56e6751694697a0d23e240 Mon Sep 17 00:00:00 2001
From: John Fultz <jfultz@wolfram.com>
Date: Thu, 10 Aug 2017 00:08:04 -0500
Subject: 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.
---
 test/test.pro | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/test.pro b/test/test.pro
index 4fbf69a..e244ff5 100644
--- a/test/test.pro
+++ b/test/test.pro
@@ -5,10 +5,11 @@ INCLUDEPATH += . ..
 # enable/disable debug symbols
 # CONFIG += debug
 
-CONFIG += console
+CONFIG += console c++14
 CONFIG -= x11
 CONFIG -= app_bundle
 CONFIG += release
+CONFIG -= debug
 
 debug {
   OBJECTS_DIR = obj/debug
@@ -26,7 +27,9 @@ win32:!win32-g++ {
   LIBS += -lquackleio -lquackle
 }
 
-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
 HEADERS += testharness.h trademarkedboards.h
@@ -36,3 +39,7 @@ SOURCES += testharness.cpp testmain.cpp trademarkedboards.cpp
 macx-g++ {
     QMAKE_CXXFLAGS += -fpermissive
 }
+
+linux { # old unixes/Qt distribs running around...most notably on Travis-CI
+  QMAKE_CXXFLAGS += -std=c++1y
+}
-- 
cgit v1.2.3