Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass -std=c++11 when using Unix makefile on Travis explicitly

Browse Source 
wx-config doesn't include -std=c++11 in its output currently and it's not
clear whether it should (consider c++11 vs gnu++11 or even vs c++14), so add
this compiler option explicitly in C++11 Travis builds.
This commit is contained in:
Vadim Zeitlin
2016-01-25 01:26:33 +01:00
parent 6a3b6600dd
commit e6db20d908
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -14,13 +14,13 @@ matrix:
compiler: gcc compiler: gcc
- dist: trusty - dist: trusty
compiler: gcc compiler: gcc
env: wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" env: wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11"
- dist: trusty - dist: trusty
compiler: clang compiler: clang
env: wxCONFIGURE_FLAGS="--disable-shared" env: wxCONFIGURE_FLAGS="--disable-shared"
- os: osx - os: osx
compiler: clang compiler: clang
env: wxCONFIGURE_FLAGS="--enable-cxx11" env: wxCONFIGURE_FLAGS="--enable-cxx11" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11"
branches: branches:
only: only:
@@ -56,5 +56,5 @@ script:
- sudo make install - sudo make install
- echo -en 'travis_fold:end:script.5\\r' - echo -en 'travis_fold:end:script.5\\r'
- echo 'Testing building with the installed version...' && echo -en 'travis_fold:start:script.6\\r' - echo 'Testing building with the installed version...' && echo -en 'travis_fold:start:script.6\\r'
- make -C samples/minimal -f makefile.unx -B - make -C samples/minimal -f makefile.unx -B $wxMAKEFILE_FLAGS
- echo -en 'travis_fold:end:script.6\\r' - echo -en 'travis_fold:end:script.6\\r'