Merge pull request #124 from yhirose/cpp17

C++17 support

.github/workflows/cmake.yml

@@ -0,0 +1,49 @@
+name: CMake
+
+on: [push, pull_request]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, macos-latest, windows-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{runner.workspace}}/build
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      working-directory: ${{runner.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source
+      # and build directories, but this is only available with CMake 3.13 and higher.
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    - name: Build
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Test
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -C $BUILD_TYPE

.travis.yml

@@ -1,39 +1,20 @@
 language: cpp
-sudo: false
 
 matrix:
   include:
-    - compiler: gcc
+    - os: linux
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - george-edison55-precise-backports
           packages:
-            - cmake
-            - cmake-data
-            - gcc-4.9
-            - g++-4.9
-      env: COMPILER=g++-4.9
-#    - compiler: clang
-#      addons:
-#        apt:
-#          sources:
-#            - kubuntu-backports
-#            - ubuntu-toolchain-r-test
-#            - llvm-toolchain-precise-3.7
-#          packages:
-#            - cmake
-#            - clang-3.7
-#      env: COMPILER=clang++-3.7
+            - g++-8
+      env:
+         - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
 
-branches:
-    only:
-        - master
-
-before_script:
-  - export CXX=$COMPILER
+before_install:
+  - eval "${MATRIX_EVAL}"
 
 script:
   - mkdir build && cd build
-  - cmake .. && make && ctest -V
+  - cmake .. && make && ./test/test-main

CMakeLists.txt

@@ -1,33 +1,11 @@
 cmake_minimum_required(VERSION 3.1.0)
 project("cpp-peglib")
 
-# Check if a supported compiler is used to setup the C++ standard to use:
-get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
-list(FIND known_features "cxx_std_17" found)
-if(NOT ${found} EQUAL -1)
-  # C++17 standard is supported
-  set(CMAKE_CXX_STANDARD 17)
-else()
-  # Check for C++11 standard support
-  list(FIND known_features "cxx_std_11" found)
-  if(NOT ${found} EQUAL -1)
-    # C++11 standard is supported
-    set(CMAKE_CXX_STANDARD 11)
-  endif()
-endif()
-
-if(${found} EQUAL -1)
-  message(FATAL_ERROR "Your compiler is not supported.")
-endif()
-
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Wno-c++98-compat -Wno-padded -Wno-weak-vtables -Wno-exit-time-destructors -Wno-c++2a-compat -Wno-switch-enum -Wno-c++98-compat-pedantic")
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wpedantic -Wextra -Woverloaded-virtual")
-elseif(MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4503 /wd4512 /utf-8")
+if(MSVC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus /utf-8")
 endif()
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -37,10 +15,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   set(add_link_deps Threads::Threads)
 endif()
 
-enable_testing()
-
-add_subdirectory(test)
 add_subdirectory(example)
 add_subdirectory(lint)
 
+add_subdirectory(test)
+enable_testing()
+
 install(FILES peglib.h DESTINATION include)