Merge pull request #17 from m-peko/support-cpp11-cpp14

Support C++11 and C++14

Author: m-peko

.travis.yml

@@ -6,7 +6,7 @@ notifications:
 matrix:
   include:
 
-  - name: "Linux GCC"
+  - name: "Linux GCC C++11"
     os: linux
     dist: bionic
     compiler: gcc
@@ -18,11 +18,49 @@ matrix:
           - gcc-8
           - g++-8
     before_script:
+      - CPP_VERSION=11
+
+      # Install new alternatives
+      - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 30
+      - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 30
+
+  - name: "Linux GCC C++14"
+    os: linux
+    dist: bionic
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+          - ubuntu-toolchain-r-test
+        packages:
+          - gcc-8
+          - g++-8
+    before_script:
+      - CPP_VERSION=14
+
       # Install new alternatives
       - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 30
       - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 30
 
-  - name: "Linux CLANG"
+  - name: "Linux GCC C++17"
+    os: linux
+    dist: bionic
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+          - ubuntu-toolchain-r-test
+        packages:
+          - gcc-8
+          - g++-8
+    before_script:
+      - CPP_VERSION=17
+
+      # Install new alternatives
+      - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 30
+      - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 30
+
+  - name: "Linux CLANG C++11"
     os: linux
     dist: bionic
     compiler: clang
@@ -34,10 +72,56 @@ matrix:
           - gcc-8
           - g++-8
           - clang-7
+    before_script:
+      - CPP_VERSION=11
 
-  - name: "Windows MSVC"
+  - name: "Linux CLANG C++14"
+    os: linux
+    dist: bionic
+    compiler: clang
+    addons:
+      apt:
+        sources:
+          - ubuntu-toolchain-r-test
+        packages:
+          - gcc-8
+          - g++-8
+          - clang-7
+    before_script:
+      - CPP_VERSION=14
+
+  - name: "Linux CLANG C++17"
+    os: linux
+    dist: bionic
+    compiler: clang
+    addons:
+      apt:
+        sources:
+          - ubuntu-toolchain-r-test
+        packages:
+          - gcc-8
+          - g++-8
+          - clang-7
+    before_script:
+      - CPP_VERSION=17
+
+  - name: "Windows MSVC C++11"
     os: windows
     compiler: msvc
+    before_script:
+      - CPP_VERSION=11
+
+  - name: "Windows MSVC C++14"
+    os: windows
+    compiler: msvc
+    before_script:
+      - CPP_VERSION=14
+
+  - name: "Windows MSVC C++17"
+    os: windows
+    compiler: msvc
+    before_script:
+      - CPP_VERSION=17
 
   - name: "Linux GCC Code Coverage"
     os: linux
@@ -71,7 +155,7 @@ script:
   - cd build
 
   # Generate build files
-  - cmake .. -DBITFLAGS_ENABLE_COVERAGE:BOOL=${ENABLE_COVERAGE-False}
+  - cmake .. -DBITFLAGS_CPP_VERSION:INTEGER=${CPP_VERSION-17} -DBITFLAGS_ENABLE_COVERAGE:BOOL=${ENABLE_COVERAGE-False}
 
   # Compile examples and tests
   # - cmake --build . --target samples

CMakeLists.txt

@@ -33,7 +33,15 @@ else ()
     )
 endif ()
 
-set (CMAKE_CXX_STANDARD 17)
+if (BITFLAGS_CPP_VERSION EQUAL 17)
+    message (STATUS "Using C++17")
+elseif (BITFLAGS_CPP_VERSION EQUAL 14)
+    message (STATUS "Using C++14")
+elseif (BITFLAGS_CPP_VERSION EQUAL 11)
+    message (STATUS "Using C++11")
+endif ()
+
+set (CMAKE_CXX_STANDARD ${BITFLAGS_CPP_VERSION})
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
@@ -54,12 +62,12 @@ endif ()
 option (BITFLAGS_BUILD_SAMPLES "Build examples" ON)
 option (BITFLAGS_BUILD_TESTS "Build tests" ON)
 
-include(GNUInstallDirs)
+include (GNUInstallDirs)
 
 add_library (bitflags INTERFACE)
 add_library (bitflags::bitflags ALIAS bitflags)
 
-target_compile_features (bitflags INTERFACE cxx_std_17)
+target_compile_features (bitflags INTERFACE cxx_std_${BITFLAGS_CPP_VERSION})
 target_include_directories (
     bitflags INTERFACE
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
@@ -91,8 +99,8 @@ if (BITFLAGS_BUILD_TESTS)
 endif ()
 
 if (NOT BITFLAGS_SUBPROJECT)
-    include(CMakePackageConfigHelpers)
-    
+    include (CMakePackageConfigHelpers)
+
     install (TARGETS bitflags EXPORT bitflags-config)
 
     write_basic_package_version_file (

README.md

@@ -2,11 +2,13 @@
 
 <img src="img/logo.png" height="120px"/>
 
-Single-header header-only C++17 library for easily managing set of auto-generated type-safe flags.
+Single-header header-only C++11 / C++14 / C++17 library for easily managing set of auto-generated type-safe flags.
 
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/m-peko/bitflags/blob/master/LICENSE)
 [![Build Status](https://travis-ci.org/m-peko/bitflags.svg?branch=master)](https://travis-ci.org/m-peko/bitflags)
 [![Codecov](https://codecov.io/gh/m-peko/bitflags/branch/master/graph/badge.svg)](https://codecov.io/gh/m-peko/bitflags)
+[![Standard](https://img.shields.io/badge/C%2B%2B-11-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B11)
+[![Standard](https://img.shields.io/badge/C%2B%2B-14-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B14)
 [![Standard](https://img.shields.io/badge/C%2B%2B-17-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B17)
 [![Compiler explorer](https://img.shields.io/badge/compiler_explorer-online-blue.svg)](https://godbolt.org/z/KPG963)
 
@@ -93,7 +95,7 @@ _So, why should I use `bitflags` library?_
 
 ## Getting Started
 
-`bitflags` is a single-header header-only C++17 library for easily managing set of auto-generated type-safe flags.
+`bitflags` is a single-header header-only C++11 / C++14 / C++17 library for easily managing set of auto-generated type-safe flags.
 
 ### Raw flags vs flags?