Add more compilers to CI and increase FMT_PEDANTIC warning levels (#736)

* Add a _lot_ more warnings to FMT_PEDANTIC
Fix these warnings

* Add more compilers to CI
Fix (some) of the compiler errors with them

* Enable -Werror on CI
Increase warning level on MSVC when compiling with FMT_PEDANTIC

* Add VS 2013 and 2015 to Appveyor

* Fix Appveyor tests
Formatting

* Implement requested changes
Fix some of the MSVC warnings
Implement C++11 integer_sequence

* Reintroduce appveyor-build.py

* Remove ranges-test from tests

* Remove (some) explicit warning suppressions
Fix C++ standard setting in CI

* Remove (some) explicit warning suppressions
Fix C++ standard setting in CI

* Fix test builds with C++11

* Enable pedantic warnings on tests

* Fix warnings from edits to master

* Cleanups

* Add C++11 support to ranges.h
Re-enable ranges-test
Fix a Visual Studio error about function not returning a value in printf.h
Fix a bug in .travis.yml

support/appveyor-build.py

@@ -6,9 +6,11 @@ from subprocess import check_call
 
 build = os.environ['BUILD']
 config = os.environ['CONFIGURATION']
-platform = os.environ.get('PLATFORM')
+platform = os.environ['PLATFORM']
 path = os.environ['PATH']
-cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config]
+image = os.environ['APPVEYOR_BUILD_WORKER_IMAGE']
+jobid = os.environ['APPVEYOR_JOB_ID']
+cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config, '..']
 if build == 'mingw':
     cmake_command.append('-GMinGW Makefiles')
     build_command = ['mingw32-make', '-j4']
@@ -21,7 +23,12 @@ else:
     # Add MSBuild 14.0 to PATH as described in
     # http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc.
     os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\15.0\Bin;' + path
-    generator = 'Visual Studio 15 2017'
+    if image == 'Visual Studio 2013':
+        generator = 'Visual Studio 12 2013'
+    elif image == 'Visual Studio 2015':
+        generator = 'Visual Studio 14 2015'
+    elif image == 'Visual Studio 2017':
+        generator = 'Visual Studio 15 2017'
     if platform == 'x64':
         generator += ' Win64'
     cmake_command.append('-G' + generator)

support/appveyor.yml

@@ -2,21 +2,32 @@ configuration:
   - Debug
   - Release
 
-image: Visual Studio 2017
+clone_depth: 1
+
+platform:
+  - Win32
+  - x64
+
+image:
+  - Visual Studio 2013
+  - Visual Studio 2015
+  - Visual Studio 2017
 
 environment:
   CTEST_OUTPUT_ON_FAILURE: 1
-  matrix:
-  - BUILD: msvc
-  - BUILD: msvc
-    PLATFORM: x64
+  MSVC_DEFAULT_OPTIONS: ON
+  BUILD: msvc
+
+matrix:
+  allow_failures:
+    - image: Visual Studio 2013
 
 before_build:
-  # Workaround for CMake not wanting sh.exe on PATH for MinGW.
-  - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+ - mkdir build
+ - cd build
 
 build_script:
-  - python support/appveyor-build.py
+  - python ../support/appveyor-build.py
 
 on_failure:
   - appveyor PushArtifact Testing/Temporary/LastTest.log

support/cmake/cxx14.cmake

@@ -1,67 +1,52 @@
 # C++14 feature support detection
 
-if (NOT FMT_USE_CPP14)
-  return()
-endif ()
-
+include(CheckCXXSourceCompiles)
 include(CheckCXXCompilerFlag)
 
-if (FMT_USE_CPP14)
-  check_cxx_compiler_flag(-std=c++14 HAVE_STD_CPP14_FLAG)
-  if (HAVE_STD_CPP14_FLAG)
-    # Check if including cmath works with -std=c++14 and -O3.
-    # It may not in MinGW due to bug http://ehc.ac/p/mingw/bugs/2250/.
-    set(CMAKE_REQUIRED_FLAGS "-std=c++14 -O3")
-    check_cxx_source_compiles("
-      #include <cmath>
-      int main() {}" FMT_CPP14_CMATH)
-    # Check if including <unistd.h> works with -std=c++14.
-    # It may not in MinGW due to bug http://sourceforge.net/p/mingw/bugs/2024/.
-    check_cxx_source_compiles("
-      #include <unistd.h>
-      int main() {}" FMT_CPP14_UNISTD_H)
-    # Check if snprintf works with -std=c++14. It may not in MinGW.
-    check_cxx_source_compiles("
-      #include <stdio.h>
-      int main() {
-        char buffer[10];
-        snprintf(buffer, 10, \"foo\");
-      }" FMT_CPP14_SNPRINTF)
-    if (FMT_CPP14_CMATH AND FMT_CPP14_UNISTD_H AND FMT_CPP14_SNPRINTF)
-      set(CPP14_FLAG -std=c++14)
-    else ()
-      check_cxx_compiler_flag(-std=gnu++14 HAVE_STD_GNUPP14_FLAG)
-      if (HAVE_STD_CPP14_FLAG)
-        set(CPP14_FLAG -std=gnu++14)
-      endif ()
-    endif ()
-    set(CMAKE_REQUIRED_FLAGS )
-  else ()
-    check_cxx_compiler_flag(-std=c++1y HAVE_STD_CPP1Y_FLAG)
-    if (HAVE_STD_CPP1Y_FLAG)
-      set(CPP14_FLAG -std=c++1y)
-    else ()
-      # Fallback on c++11 if c++14 is not available.
-      check_cxx_compiler_flag(-std=c++11 HAVE_STD_CPP11_FLAG)
-      if (HAVE_STD_CPP11_FLAG)
-        set(CPP14_FLAG -std=c++11)
-      else ()
-        check_cxx_compiler_flag(-std=c++0x HAVE_STD_CPP0X_FLAG)
-        if (HAVE_STD_CPP0X_FLAG)
-          set(CPP14_FLAG -std=c++0x)
-        endif ()
-      endif ()
-    endif ()
+if (NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 11)
+endif()
+message(STATUS "CXX_STANDARD: ${CMAKE_CXX_STANDARD}")
+
+if (CMAKE_CXX_STANDARD EQUAL 20)
+  check_cxx_compiler_flag(-std=c++20 has_std_20_flag)
+  check_cxx_compiler_flag(-std=c++2a has_std_2a_flag)
+
+  if (has_std_20_flag)
+    set(CXX_STANDARD_FLAG -std=c++20)
+  elseif (has_std_2a_flag)
+    set(CXX_STANDARD_FLAG -std=c++2a)
+  endif ()
+elseif (CMAKE_CXX_STANDARD EQUAL 17)
+  check_cxx_compiler_flag(-std=c++17 has_std_17_flag)
+  check_cxx_compiler_flag(-std=c++1z has_std_1z_flag)
+
+  if (has_std_17_flag)
+    set(CXX_STANDARD_FLAG -std=c++17)
+  elseif (has_std_1z_flag)
+    set(CXX_STANDARD_FLAG -std=c++1z)
+  endif ()
+elseif (CMAKE_CXX_STANDARD EQUAL 14)
+  check_cxx_compiler_flag(-std=c++14 has_std_14_flag)
+  check_cxx_compiler_flag(-std=c++1y has_std_1y_flag)
+
+  if (has_std_14_flag)
+    set(CXX_STANDARD_FLAG -std=c++14)
+  elseif (has_std_1y_flag)
+    set(CXX_STANDARD_FLAG -std=c++1y)
+  endif ()
+elseif (CMAKE_CXX_STANDARD EQUAL 11)
+  check_cxx_compiler_flag(-std=c++11 has_std_11_flag)
+  check_cxx_compiler_flag(-std=c++0x has_std_0x_flag)
+
+  if (has_std_11_flag)
+    set(CXX_STANDARD_FLAG -std=c++11)
+  elseif (has_std_0x_flag)
+    set(CXX_STANDARD_FLAG -std=c++0x)
   endif ()
 endif ()
 
-if (CMAKE_CXX_STANDARD)
-  # Don't use -std compiler flag if CMAKE_CXX_STANDARD is specified.
-  set(CPP14_FLAG )
-endif ()
-
-message(STATUS "CPP14_FLAG: ${CPP14_FLAG}")
-set(CMAKE_REQUIRED_FLAGS ${CPP14_FLAG})
+set(CMAKE_REQUIRED_FLAGS ${CXX_STANDARD_FLAG})
 
 # Check if variadic templates are working and not affected by GCC bug 39653:
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=39653
@@ -69,17 +54,26 @@ check_cxx_source_compiles("
   template <class T, class ...Types>
   struct S { typedef typename S<Types...>::type type; };
   int main() {}" SUPPORTS_VARIADIC_TEMPLATES)
+if (NOT SUPPORTS_VARIADIC_TEMPLATES)
+  set (SUPPORTS_VARIADIC_TEMPLATES OFF)
+endif ()
 
 # Check if initializer lists are supported.
 check_cxx_source_compiles("
   #include <initializer_list>
   int main() {}" SUPPORTS_INITIALIZER_LIST)
+if (NOT SUPPORTS_INITIALIZER_LIST)
+  set (SUPPORTS_INITIALIZER_LIST OFF)
+endif ()
 
 # Check if enum bases are available
 check_cxx_source_compiles("
   enum C : char {A};
   int main() {}"
   SUPPORTS_ENUM_BASE)
+if (NOT SUPPORTS_ENUM_BASE)
+  set (SUPPORTS_ENUM_BASE OFF)
+endif ()
 
 # Check if type traits are available
 check_cxx_source_compiles("
@@ -87,11 +81,17 @@ check_cxx_source_compiles("
   class C { void operator=(const C&); };
   int main() { static_assert(!std::is_copy_assignable<C>::value, \"\"); }"
   SUPPORTS_TYPE_TRAITS)
+if (NOT SUPPORTS_TYPE_TRAITS)
+  set (SUPPORTS_TYPE_TRAITS OFF)
+endif ()
 
 # Check if user-defined literals are available
 check_cxx_source_compiles("
   void operator\"\" _udl(long double);
   int main() {}"
   SUPPORTS_USER_DEFINED_LITERALS)
+if (NOT SUPPORTS_USER_DEFINED_LITERALS)
+  set (SUPPORTS_USER_DEFINED_LITERALS OFF)
+endif ()
 
 set(CMAKE_REQUIRED_FLAGS )

support/travis-build.py

@@ -2,8 +2,8 @@
 # Build the project on Travis CI.
 
 from __future__ import print_function
-import errno, os, re, shutil, subprocess, sys, tempfile, urllib
-from subprocess import call, check_call, check_output, Popen, PIPE, STDOUT
+import errno, os, shutil, subprocess, sys, urllib
+from subprocess import call, check_call, Popen, PIPE, STDOUT
 
 def rmtree_if_exists(dir):
     try:
@@ -85,14 +85,12 @@ test_build_dir = os.path.join(fmt_dir, "_build_test")
 
 # Configure library.
 makedirs_if_not_exist(build_dir)
-common_cmake_flags = [
-    '-DCMAKE_INSTALL_PREFIX=' + install_dir, '-DCMAKE_BUILD_TYPE=' + build
+cmake_flags = [
+    '-DCMAKE_INSTALL_PREFIX=' + install_dir, '-DCMAKE_BUILD_TYPE=' + build,
+    '-DCMAKE_CXX_STANDARD=' + standard
 ]
-extra_cmake_flags = []
-if standard != '14':
-    extra_cmake_flags = ['-DCMAKE_CXX_FLAGS=-std=c++' + standard]
-check_call(['cmake', '-DFMT_DOC=OFF', '-DFMT_PEDANTIC=ON', fmt_dir] +
-           common_cmake_flags + extra_cmake_flags, cwd=build_dir)
+check_call(['cmake', '-DFMT_DOC=OFF', '-DFMT_PEDANTIC=ON', '-DFMT_WERROR=ON', fmt_dir] +
+           cmake_flags, cwd=build_dir)
 
 # Build library.
 check_call(['make', '-j4'], cwd=build_dir)
@@ -101,7 +99,7 @@ check_call(['make', '-j4'], cwd=build_dir)
 env = os.environ.copy()
 env['CTEST_OUTPUT_ON_FAILURE'] = '1'
 if call(['make', 'test'], env=env, cwd=build_dir):
-    with open('Testing/Temporary/LastTest.log', 'r') as f:
+    with open(os.path.join(build_dir, 'Testing', 'Temporary', 'LastTest.log'), 'r') as f:
         print(f.read())
     sys.exit(-1)
 
@@ -110,7 +108,6 @@ check_call(['make', 'install'], cwd=build_dir)
 
 # Test installation.
 makedirs_if_not_exist(test_build_dir)
-check_call(['cmake', '-DCMAKE_CXX_FLAGS=-std=c++' + standard,
-                     os.path.join(fmt_dir, "test", "find-package-test")] +
-           common_cmake_flags, cwd=test_build_dir)
+check_call(['cmake', os.path.join(fmt_dir, "test", "find-package-test")] +
+            cmake_flags, cwd=test_build_dir)
 check_call(['make', '-j4'], cwd=test_build_dir)