Simplify Travis CI builds.

Have one script per build. This means more duplication between the
scripts, but it's much easier to understand and to run locally.

2 files changed, 3 insertions, 47 deletions

diff --git a/cmake/AddCompilerFlag.cmake b/cmake/AddCompilerFlag.cmake
deleted file mode 100644
index 6a4a3f56..00000000
--- a/cmake/AddCompilerFlag.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-
-function(add_cflag flag)
-  string(REGEX REPLACE "[^a-zA-Z0-9_]" "_" var ${flag})
-  if(NOT DEFINED HAVE_C${var})
-    message(STATUS "checking for C compiler flag: ${flag}")
-  endif()
-  set(CMAKE_REQUIRED_QUIET TRUE)
-
-  check_c_compiler_flag("${flag}" HAVE_C${var} QUIET)
-  if(HAVE_C${var})
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(add_cxxflag flag)
-  string(REGEX REPLACE "[^a-zA-Z0-9_]" "_" var ${flag})
-  if(NOT DEFINED HAVE_CXX${var})
-    message(STATUS "checking for C++ compiler flag: ${flag}")
-  endif()
-  set(CMAKE_REQUIRED_QUIET TRUE)
-
-  check_cxx_compiler_flag("${flag}" HAVE_CXX${var} QUIET)
-  if(HAVE_CXX${var})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(add_dllflag flag)
-  string(REGEX REPLACE "[^a-zA-Z0-9_]" "_" var ${flag})
-  if(NOT DEFINED HAVE_LD${var})
-    message(STATUS "checking for C++ compiler flag: ${flag}")
-  endif()
-  set(CMAKE_REQUIRED_QUIET TRUE)
-
-  check_c_compiler_flag("${flag}" HAVE_LD${var} QUIET)
-  if(HAVE_LD${var})
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${flag}" PARENT_SCOPE)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-macro(add_flag flag)
-  add_cflag(${flag})
-  add_cxxflag(${flag})
-endmacro()
diff --git a/cmake/CompileGTest.cmake b/cmake/CompileGTest.cmake
index f9aa4506..9aa4712f 100644
--- a/cmake/CompileGTest.cmake
+++ b/cmake/CompileGTest.cmake
@@ -1,5 +1,8 @@
 # Find and compile the GTest library.
 
+include(CheckCXXCompilerFlag)
+include(CheckIncludeFileCXX)
+
 message(STATUS "Checking for gtest")
 
 # Look for the sources.