Added clang & OS X to .travis

932b22f0 · Wouter van Oortmerssen · ecf5a6a5 · 932b22f0 · 932b22f0
Commit 932b22f0 authored May 27, 2015 by Wouter van Oortmerssen
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

.travis.yml .travis.yml +5 -0

CMakeLists.txt CMakeLists.txt +4 -1

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,11 @@ language: cpp

 os:
 - linux
+- osx
+
+compiler:
+  - gcc
+  #- clang

 env:
  matrix:

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,9 +74,12 @@ set(FlatBuffers_Sample_Text_SRCS
 if(APPLE)
  set(CMAKE_CXX_FLAGS
    "${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
    "${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()

 if(FLATBUFFERS_CODE_COVERAGE)