Переглянути джерело

Try to update compilers used for Travis CI

bel2125 7 роки тому
батько
коміт
c4498a0916
2 змінених файлів з 11 додано та 5 видалено
  1. 2 2
      .travis.yml
  2. 9 3
      CMakeLists.txt

+ 2 - 2
.travis.yml

@@ -16,8 +16,8 @@ addons:
       - cmake
       - openssl
       - libssl-dev
-      - gcc-4.6
-      - clang-3.4
+      - gcc-5.4
+      - clang-3.8
     sources:
       - kubuntu-backports
       - ubuntu-toolchain-r-test

+ 9 - 3
CMakeLists.txt

@@ -105,10 +105,16 @@ message(STATUS "Executable installation - ${CIVETWEB_INSTALL_EXECUTABLE}")
 
 # Allow builds to complete with warnings (do not set -Werror)
 if (LINUX)
-# CivetWeb Linux support is stable: Builds must be free from warnings.
-  option(CIVETWEB_ALLOW_WARNINGS "Do not stop build if there are warnings" OFF)
+# CivetWeb Linux support is stable:
+# Builds for GCC 4.6 and clang 3.4 are free from warnings.
+# However, GCC introduced a couple of new, partially idiotic warnings,
+# that can not be disabled using a #pragma directive.
+# It seems unreasonable to have all GCC versions warning free, but only
+# some selected ones.
+# For the moment, allow warnings.
+  option(CIVETWEB_ALLOW_WARNINGS "Do not stop build if there are warnings" ON)
 else()
-# CivetWeb Linux support for other systems is in a setup phase.
+# CivetWeb support for OSX works, but is not free of warnings.
   option(CIVETWEB_ALLOW_WARNINGS "Do not stop build if there are warnings" ON)
 endif()
 message(STATUS "Build if there are warnings - ${CIVETWEB_ALLOW_WARNINGS}")