Skip to content

F
flatbuffers
Commit 932b22f0 authored by Wouter van Oortmerssen's avatar Wouter van Oortmerssen
Browse files
Options

Added clang & OS X to .travis

parent ecf5a6a5
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 1 deletion
.travis.yml
View file @ 932b22f0
...@@ -2,6 +2,11 @@ language: cpp ...@@ -2,6 +2,11 @@ language: cpp
os: os:
- linux - linux
- osx
compiler:
- gcc
#- clang
env: env:
matrix: matrix:
......
CMakeLists.txt
View file @ 932b22f0
...@@ -74,9 +74,12 @@ set(FlatBuffers_Sample_Text_SRCS ...@@ -74,9 +74,12 @@ set(FlatBuffers_Sample_Text_SRCS
if(APPLE) if(APPLE)
set(CMAKE_CXX_FLAGS set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall -pedantic -Werror -Wextra") "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
elseif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") elseif(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra") "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra")
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
endif() endif()
if(FLATBUFFERS_CODE_COVERAGE) if(FLATBUFFERS_CODE_COVERAGE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment