From f9403005dca7408727cd3e3513ff12f9b37db1be Mon Sep 17 00:00:00 2001
From: greg <greg7mdp@gmail.com>
Date: Wed, 27 Mar 2019 20:37:51 -0400
Subject: [PATCH] fix travis

---
 .travis.yml    | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++
 CMakeLists.txt | 13 ++++---
 2 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4f90f89..459292a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,103 @@ matrix:
       compiler: clang
       env: COMPILER='clang++' CXXSTD='c++11'
 
+    - os: linux
+      compiler: gcc
+      env: COMPILER='g++' CXXSTD='c++11'
 
+    - os: linux
+      compiler: clang
+      env: COMPILER='clang++' CXXSTD='c++11'
+
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources: 
+            - ubuntu-toolchain-r-test
+          packages: 
+            - g++-5
+      env: COMPILER='g++-5' CXXSTD='c++11'
+
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources: 
+            - ubuntu-toolchain-r-test
+          packages: 
+            - g++-6
+      env: COMPILER='g++-6' CXXSTD='c++11'
+
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources: 
+            - ubuntu-toolchain-r-test
+          packages: 
+            - g++-7
+      env: COMPILER='g++-7' CXXSTD='c++11'
+
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources: 
+            - ubuntu-toolchain-r-test
+          packages: 
+            - g++-8
+      env: COMPILER='g++-8' CXXSTD='c++14'
+
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources: 
+            - ubuntu-toolchain-r-test
+          packages: 
+            - g++-8
+      env: COMPILER='g++-8' CXXSTD='c++17'
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: 
+            - llvm-toolchain-trusty-3.9
+          packages:
+            - clang-3.9
+      env: COMPILER='clang++-3.9' CXXSTD='c++11'
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: 
+            - llvm-toolchain-trusty-4.0
+          packages:
+            - clang-4.0
+      env: COMPILER='clang++-4.0' CXXSTD='c++11'
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: 
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - clang-5.0
+      env: COMPILER='clang++-5.0' CXXSTD='c++14'
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: 
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - clang-5.0
+      env: COMPILER='clang++-5.0' CXXSTD='c++17'
 
 dist: trusty
 sudo: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23fd6b3..c5e7701 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,12 +41,15 @@ export(EXPORT ${PROJECT_NAME}-targets
 option(PHMAP_BUILD_TESTS    "Whether or not to build the tests"    OFF)
 option(PHMAP_BUILD_EXAMPLES "Whether or not to build the examples" OFF)
 
+if(MSVC)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+elseif(CXXFLAGS)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXXFLAGS}")
+else()
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif()
+
 if (PHMAP_BUILD_TESTS)
-    if(MSVC)
-         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-    else()
-         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif()
 
     include(cmake/DownloadGTest.cmake)
     include_directories(${PROJECT_SOURCE_DIR})