Added clang & OS X to .travis

RAldrich · May 28, 2015 · 932b22f · 932b22f
1 parent ecf5a6a
commit 932b22f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,11 @@ language: cpp
 
 os:
 - linux
+- osx
+
+compiler:
+  - gcc
+  #- clang
 
 env:
   matrix:

diff --git 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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,11 @@ language: cpp @@
     os:
     - linux
+    - osx
+    compiler:
+      - gcc
+      #- clang
     env:
       matrix:
@@ Expand Down @@