update ci and cmake
This commit is contained in:
parent
d69f91daa5
commit
12bb8c0df3
3 changed files with 7 additions and 5 deletions
4
.github/workflows/macos.yml
vendored
4
.github/workflows/macos.yml
vendored
|
@ -9,8 +9,8 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
config:
|
config:
|
||||||
- { os: macos-10.15 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
|
- { os: macos-10.15 }
|
||||||
- { os: macos-11.0 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md#xcode
|
- { os: macos-11.0 }
|
||||||
build: [Debug, Release]
|
build: [Debug, Release]
|
||||||
|
|
||||||
name: "${{matrix.config.os}}:${{matrix.build}}"
|
name: "${{matrix.config.os}}:${{matrix.build}}"
|
||||||
|
|
3
.github/workflows/ubuntu.yml
vendored
3
.github/workflows/ubuntu.yml
vendored
|
@ -12,8 +12,9 @@ jobs:
|
||||||
compiler:
|
compiler:
|
||||||
- { cc: "gcc-9", cxx: "g++-9" }
|
- { cc: "gcc-9", cxx: "g++-9" }
|
||||||
- { cc: "gcc-10", cxx: "g++-10" }
|
- { cc: "gcc-10", cxx: "g++-10" }
|
||||||
- { cc: "clang-9", cxx: "clang++-9" }
|
|
||||||
- { cc: "clang-10", cxx: "clang++-10" }
|
- { cc: "clang-10", cxx: "clang++-10" }
|
||||||
|
- { cc: "clang-11", cxx: "clang++-11" }
|
||||||
|
- { cc: "clang-12", cxx: "clang++-12" }
|
||||||
|
|
||||||
name: "${{matrix.compiler.cxx}}:${{matrix.build}}"
|
name: "${{matrix.compiler.cxx}}:${{matrix.build}}"
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.8)
|
cmake_minimum_required(VERSION 3.14)
|
||||||
|
|
||||||
project(nameof VERSION "0.10.0" LANGUAGES CXX)
|
project(nameof VERSION "0.10.0" LANGUAGES CXX)
|
||||||
|
|
||||||
|
@ -32,7 +32,8 @@ target_include_directories(${PROJECT_NAME}
|
||||||
|
|
||||||
write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
|
write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
|
||||||
VERSION ${PROJECT_VERSION}
|
VERSION ${PROJECT_VERSION}
|
||||||
COMPATIBILITY AnyNewerVersion)
|
COMPATIBILITY AnyNewerVersion
|
||||||
|
ARCH_INDEPENDENT)
|
||||||
|
|
||||||
if(NAMEOF_OPT_INSTALL)
|
if(NAMEOF_OPT_INSTALL)
|
||||||
install(TARGETS ${PROJECT_NAME}
|
install(TARGETS ${PROJECT_NAME}
|
||||||
|
|
Loading…
Reference in a new issue