diff options
author | John Fultz <jfultz@wolfram.com> | 2015-10-18 23:47:04 -0500 |
---|---|---|
committer | John Fultz <jfultz@wolfram.com> | 2015-10-19 00:36:54 -0500 |
commit | 00a4b2a209ce4b90f4dca4d98b964853ce3196ff (patch) | |
tree | f43a4017244dc14b777092d738bdb0ad9a0c48ee | |
parent | 2c2a91a6154a8dafa1415ec546ac07b2486b6743 (diff) |
Fix travis builds.
* Start using g++ 4.8 and clang.
* Fix missing -std=c++11 flags.
* Builds which failed torched remaining builds, which meant more iteration.
Now, they recover and continue correctly.
* Remove some clang compiler warnings generated by Qt files out of my control.
-rw-r--r-- | .travis.yml | 44 | ||||
-rwxr-xr-x | gaddagize/gaddagize.pro | 2 | ||||
-rwxr-xr-x | makegaddag/makegaddag.pro | 1 | ||||
-rw-r--r-- | makeminidawg/makeminidawg.pro | 2 | ||||
-rw-r--r-- | quacker/quacker.pro | 2 | ||||
-rw-r--r-- | quackleio/quackleio.pro | 2 | ||||
-rw-r--r-- | test/test.pro | 1 |
7 files changed, 40 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 768c151..98216b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,33 @@ language: cpp -compiler: gcc -before_install: - - sudo apt-get update - - sudo apt-get install libqt4-dev +compiler: + - gcc + - clang +install: +- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.8 + - g++-4.8 + - clang + - libqt4-dev script: - - qmake && make - - cd quackleio && qmake && make && cd .. - - cd quacker && qmake && make && cd .. - - cd encodeleaves && qmake && make && cd .. - - cd gaddagize && qmake && make && cd .. - - cd makegaddag && qmake && make && cd .. - - cd makeminidawg && qmake && make && cd .. - - cd quackleio/iotest && qmake && make && cd ../.. - - cd test && qmake && make && cd .. + - qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make + - cd quackleio && qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make + - cd .. + - cd quacker && qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make + - cd .. + - cd encodeleaves && qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make + - cd .. + - cd gaddagize && qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make + - cd .. + - cd makegaddag && qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make + - cd .. + - cd makeminidawg && qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make + - cd .. + - cd quackleio/iotest && qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make + - cd ../.. + - cd test && qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make + - cd .. diff --git a/gaddagize/gaddagize.pro b/gaddagize/gaddagize.pro index 63bfb65..5998fbf 100755 --- a/gaddagize/gaddagize.pro +++ b/gaddagize/gaddagize.pro @@ -17,6 +17,8 @@ release { OBJECTS_DIR = obj/release } +QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register + # Input SOURCES += gaddagize.cpp diff --git a/makegaddag/makegaddag.pro b/makegaddag/makegaddag.pro index 9895c99..fa0573d 100755 --- a/makegaddag/makegaddag.pro +++ b/makegaddag/makegaddag.pro @@ -27,6 +27,7 @@ win32:!win32-g++ { LIBS += -lquackleio -lquackle } +QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register # Input SOURCES += makegaddag.cpp diff --git a/makeminidawg/makeminidawg.pro b/makeminidawg/makeminidawg.pro index e728a8a..f629a37 100644 --- a/makeminidawg/makeminidawg.pro +++ b/makeminidawg/makeminidawg.pro @@ -26,6 +26,8 @@ win32:!win32-g++ { LIBS += -lquackleio -lquackle } +QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register + # Input HEADERS += diff --git a/quacker/quacker.pro b/quacker/quacker.pro index 6e3f2e0..599fd10 100644 --- a/quacker/quacker.pro +++ b/quacker/quacker.pro @@ -31,7 +31,7 @@ win32:!win32-g++ { } macx:LIBS += -framework CoreFoundation -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register # Input HEADERS += *.h diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro index 8e43d29..dba23b8 100644 --- a/quackleio/quackleio.pro +++ b/quackleio/quackleio.pro @@ -22,6 +22,8 @@ QMAKE_CXXFLAGS += -std=c++11 CONFIG += release staticlib CONFIG -= x11 +QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register + # Input HEADERS += *.h diff --git a/test/test.pro b/test/test.pro index 99a378e..bb04d0c 100644 --- a/test/test.pro +++ b/test/test.pro @@ -26,6 +26,7 @@ win32:!win32-g++ { LIBS += -lquackleio -lquackle } +QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register # Input HEADERS += testharness.h trademarkedboards.h |