diff --git a/.appveyor.yml b/.appveyor.yml index 02a02b2c..18915a17 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 2.1.0.{build} +version: 2.1.1.{build} branches: only: diff --git a/.github/actions/quick_cmake/action.yml b/.github/actions/quick_cmake/action.yml index da721a78..28a82780 100644 --- a/.github/actions/quick_cmake/action.yml +++ b/.github/actions/quick_cmake/action.yml @@ -5,14 +5,21 @@ inputs: description: 'Other arguments' required: false default: '' + cmake-version: + description: 'The CMake version to run' + required: true runs: using: composite steps: + - name: CMake ${{ inputs.cmake-version }} + uses: jwlawson/actions-setup-cmake@v1.11 + with: + cmake-version: "${{ inputs.cmake-version }}" - run: | mkdir -p build-tmp touch build-tmp/tmp rm -r build-tmp/* - (cd build-tmp && cmake .. ${{ inputs.args}}) + (cd build-tmp && cmake .. ${{ inputs.args }}) rm -r build-tmp shell: bash diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e0d38d2b..020ba3b2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,141 +40,111 @@ jobs: steps: - uses: actions/checkout@v2 - - name: CMake 3.4 - uses: jwlawson/actions-setup-cmake@v1.11 + - name: Check CMake 3.4 with: cmake-version: "3.4" - - name: Check CMake 3.4 uses: ./.github/actions/quick_cmake - - name: CMake 3.5 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.5" - name: Check CMake 3.5 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.5" if: success() || failure() - - name: CMake 3.6 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.6" - name: Check CMake 3.6 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.6" if: success() || failure() - - name: CMake 3.7 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.7" - name: Check CMake 3.7 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.7" if: success() || failure() - - name: CMake 3.8 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.8" - name: Check CMake 3.8 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.8" if: success() || failure() - - name: CMake 3.9 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.9" - name: Check CMake 3.9 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.9" if: success() || failure() - - name: CMake 3.10 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.10" - name: Check CMake 3.10 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.10" if: success() || failure() - - name: CMake 3.11 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.11" - name: Check CMake 3.11 (full) uses: ./.github/actions/quick_cmake with: + cmake-version: "3.11" args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON if: success() || failure() - - name: CMake 3.12 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.12" - name: Check CMake 3.12 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.12" if: success() || failure() - - name: CMake 3.13 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.13" - name: Check CMake 3.13 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.13" if: success() || failure() - - name: CMake 3.14 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.14" - name: Check CMake 3.14 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.14" if: success() || failure() - - name: CMake 3.15 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.15" - name: Check CMake 3.15 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.15" if: success() || failure() - - name: CMake 3.16 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.16" - name: Check CMake 3.16 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.16" if: success() || failure() - - name: CMake 3.17 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.17" - name: Check CMake 3.17 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.17" if: success() || failure() - - name: CMake 3.18 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.18" - name: Check CMake 3.18 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.18" if: success() || failure() - - name: CMake 3.19 - uses: jwlawson/actions-setup-cmake@v1.11 + - name: Check CMake 3.19 + uses: ./.github/actions/quick_cmake with: cmake-version: "3.19" - - name: Check CMake 3.19 (full) - uses: ./.github/actions/quick_cmake - with: - args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON if: success() || failure() - - name: CMake 3.20 - uses: jwlawson/actions-setup-cmake@v1.11 - with: - cmake-version: "3.20" - name: Check CMake 3.20 uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.20" + if: success() || failure() + + - name: Check CMake 3.21 (full) + uses: ./.github/actions/quick_cmake + with: + cmake-version: "3.21" + args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON if: success() || failure() diff --git a/CHANGELOG.md b/CHANGELOG.md index 2106bb1f..41c19381 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,12 @@ is not passed, or every time the option is parsed. [#633]: https://github.com/CLIUtils/CLI11/pull/633 [#635]: https://github.com/CLIUtils/CLI11/pull/635 +### Version 2.1.1: Quick Windows fix + +* A collision with `min`/`max` macros on Windows has been fixed. [#642][] + +[#642]: https://github.com/CLIUtils/CLI11/pull/642 + ## Version 2.0: Simplification This version focuses on cleaning up deprecated functionality, and some minor diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d7b6716..3227e409 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.4) # Note: this is a header only library. If you have an older CMake than 3.4, # just add the CLI11/include directory and that's all you need to do. -# Make sure users don't get warnings on a tested (3.4 to 3.20) version +# Make sure users don't get warnings on a tested (3.4 to 3.21) version # of CMake. For most of the policies, the new version is better (hence the change). -# We don't use the 3.4...3.20 syntax because of a bug in an older MSVC's +# We don't use the 3.4...3.21 syntax because of a bug in an older MSVC's # built-in and modified CMake 3.11 -if(${CMAKE_VERSION} VERSION_LESS 3.20) +if(${CMAKE_VERSION} VERSION_LESS 3.21) cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) else() - cmake_policy(VERSION 3.20) + cmake_policy(VERSION 3.21) endif() set(VERSION_REGEX "#define CLI11_VERSION[ \t]+\"(.+)\"") diff --git a/include/CLI/Version.hpp b/include/CLI/Version.hpp index 5fa9d2a0..c989ae86 100644 --- a/include/CLI/Version.hpp +++ b/include/CLI/Version.hpp @@ -10,7 +10,7 @@ #define CLI11_VERSION_MAJOR 2 #define CLI11_VERSION_MINOR 1 -#define CLI11_VERSION_PATCH 0 -#define CLI11_VERSION "2.1.0" +#define CLI11_VERSION_PATCH 1 +#define CLI11_VERSION "2.1.1" // [CLI11:version_hpp:end]