Skip to content

Commit

Permalink
Merge branch 'aminya:main' into feature/cross-mingw
Browse files Browse the repository at this point in the history
  • Loading branch information
abeimler authored Dec 29, 2022
2 parents e69ad1e + 82cc30e commit c9bb00b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
# and your own projects needs
matrix:
os:
- ubuntu-20.04
- ubuntu-22.04
- macos-11
- windows-2022
compiler:
Expand All @@ -50,10 +50,10 @@ jobs:
GCOV: "llvm-cov gcov"

# Only to test non-multiconfig builds
- os: ubuntu-20.04
- os: ubuntu-22.04
compiler: gcc-11
CMAKE_GENERATOR: "Unix Makefiles"
GCOV: gcov
GCOV: gcov-11

- os: windows-2022
compiler: msvc
Expand All @@ -65,10 +65,10 @@ jobs:
# compiler: gcc

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/vcpkg
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ cmake_minimum_required(VERSION 3.16)
# If commented, the latest supported standard for your compiler is automatically set.
# set(CMAKE_CXX_STANDARD 20)

# Add project_options v0.22.4
# Add project_options v0.26.2
# https://github.com/aminya/project_options
# Change the version in the following URL to update the package (watch the releases of the repository for future updates)
include(FetchContent)
FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.22.4.zip)
FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.26.2.zip)
FetchContent_MakeAvailable(_project_options)
include(${_project_options_SOURCE_DIR}/Index.cmake)

Expand Down

0 comments on commit c9bb00b

Please sign in to comment.