Skip to content

Commit a2e9a1a

Browse files
authored
Merge pull request #175 from aminya/policies [skip ci]
2 parents 0a757c1 + 54d4004 commit a2e9a1a

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
matrix:
1616
os:
1717
- windows-2022
18-
- ubuntu-20.04
19-
- macos-11
18+
- ubuntu-22.04
19+
- macos-12
2020
compiler:
2121
- llvm
2222
- gcc
@@ -40,10 +40,20 @@ jobs:
4040
- os: "windows-2022"
4141
compiler: "msvc"
4242
vcvarsall: false
43+
- os: "macos-11"
44+
compiler: "gcc"
45+
cmake: true
46+
vcvarsall: true
47+
exclude:
48+
# fails with an internal error
49+
- os: "macos-12"
50+
compiler: "gcc"
51+
cmake: true
52+
vcvarsall: true
4353
steps:
44-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v3
4555
- name: Cache
46-
uses: actions/cache@v2
56+
uses: actions/cache@v3
4757
with:
4858
path: |
4959
~/vcpkg

src/Index.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ cmake_minimum_required(VERSION 3.20)
44

55
include_guard()
66

7+
# fix DOWNLOAD_EXTRACT_TIMESTAMP warning in FetchContent
8+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
9+
cmake_policy(SET CMP0135 NEW)
10+
endif()
11+
712
# only useable here
813
set(ProjectOptions_SRC_DIR ${CMAKE_CURRENT_LIST_DIR})
914

0 commit comments

Comments
 (0)