Skip to content

Commit 12bb8c0

Browse files
committed
update ci and cmake
1 parent d69f91d commit 12bb8c0

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
config:
12-
- { os: macos-10.15 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
13-
- { os: macos-11.0 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md#xcode
12+
- { os: macos-10.15 }
13+
- { os: macos-11.0 }
1414
build: [Debug, Release]
1515

1616
name: "${{matrix.config.os}}:${{matrix.build}}"

.github/workflows/ubuntu.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ jobs:
1212
compiler:
1313
- { cc: "gcc-9", cxx: "g++-9" }
1414
- { cc: "gcc-10", cxx: "g++-10" }
15-
- { cc: "clang-9", cxx: "clang++-9" }
1615
- { cc: "clang-10", cxx: "clang++-10" }
16+
- { cc: "clang-11", cxx: "clang++-11" }
17+
- { cc: "clang-12", cxx: "clang++-12" }
1718

1819
name: "${{matrix.compiler.cxx}}:${{matrix.build}}"
1920
steps:

CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8)
1+
cmake_minimum_required(VERSION 3.14)
22

33
project(nameof VERSION "0.10.0" LANGUAGES CXX)
44

@@ -32,7 +32,8 @@ target_include_directories(${PROJECT_NAME}
3232

3333
write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
3434
VERSION ${PROJECT_VERSION}
35-
COMPATIBILITY AnyNewerVersion)
35+
COMPATIBILITY AnyNewerVersion
36+
ARCH_INDEPENDENT)
3637

3738
if(NAMEOF_OPT_INSTALL)
3839
install(TARGETS ${PROJECT_NAME}

0 commit comments

Comments
 (0)