Peter M. Groen / cxxopts

Commit d10a9b5678c7ea3b2f50e8a19be7594d525c5be9

Authored by Jarryd Beck
1 parent e862445e

Upgrade GCC versions

Inline Side-by-side
Showing 2 changed files with 19 additions and 5 deletions
.travis.yml
  View file @d10a9b5
@@ -6,21 +6,35 @@ os: @@ -6,21 +6,35 @@ os:
6 matrix: 6 matrix:
7 include: 7 include:
8 - os: linux 8 - os: linux
9 - env: COMPILER=g++-4.9 9 + env: COMPILER=g++-6
10 addons: 10 addons:
11 apt: 11 apt:
12 packages: 12 packages:
13 - - g++-4.9 13 + - g++-6
14 sources: &sources 14 sources: &sources
15 - llvm-toolchain-trusty-3.8 15 - llvm-toolchain-trusty-3.8
16 - llvm-toolchain-trusty-5.0 16 - llvm-toolchain-trusty-5.0
17 - ubuntu-toolchain-r-test 17 - ubuntu-toolchain-r-test
18 - os: linux 18 - os: linux
19 - env: COMPILER=g++-4.9 UNICODE_OPTIONS=-DCXXOPTS_USE_UNICODE_HELP=Yes 19 + env: COMPILER=g++-6 UNICODE_OPTIONS=-DCXXOPTS_USE_UNICODE_HELP=Yes
20 addons: 20 addons:
21 apt: 21 apt:
22 packages: 22 packages:
23 - - g++-4.9 23 + - g++-6
  24 + sources: *sources
  25 + - os: linux
  26 + env: COMPILER=g++-7
  27 + addons:
  28 + apt:
  29 + packages:
  30 + - g++-7
  31 + sources: *sources
  32 + - os: linux
  33 + env: COMPILER=g++-7 UNICODE_OPTIONS=-DCXXOPTS_USE_UNICODE_HELP=Yes
  34 + addons:
  35 + apt:
  36 + packages:
  37 + - g++-7
24 sources: *sources 38 sources: *sources
25 - os: linux 39 - os: linux
26 env: COMPILER=g++-5 40 env: COMPILER=g++-5
cmake/cxxopts.cmake
  View file @d10a9b5
@@ -73,7 +73,7 @@ function(cxxopts_enable_warnings) @@ -73,7 +73,7 @@ function(cxxopts_enable_warnings)
73 if(MSVC) 73 if(MSVC)
74 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W2") 74 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W2")
75 elseif(CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") 75 elseif(CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
76 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -Wshadow -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion -Wsuggest-override") 76 + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -Wshadow -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion")
77 endif() 77 endif()
78 78
79 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE) 79 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE)