Skip to content

Commit c44fb55

Browse files
BurningEnlightenmentBurningEnlightenment
committed
build: Retarget clang versions to 16
1 parent 1047b51 commit c44fb55

7 files changed

Lines changed: 38 additions & 17 deletions

File tree

‎.github/workflows/cpp-ci.yml‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,21 @@ jobs:
2626
include:
2727
- os: macos-13
2828
triplet: x64-macos
29+
- os: macos-13
30+
compiler: clang
31+
triplet: x64-macos
32+
install: |
33+
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install llvm@16
2934
- os: ubuntu-22.04
3035
triplet: x64-linux
36+
- os: ubuntu-22.04
37+
triplet: x64-linux
38+
compiler: clang
39+
install: |
40+
sudo cp tools/llvm-snapshot.gpg.key.asc /etc/apt/trusted.gpg.d/llvm-snapshot.asc
41+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
42+
sudo apt-get -qq update
43+
sudo apt-get -qq -y install clang-16
3144
- os: windows-2022
3245
triplet: x64-windows
3346

@@ -37,6 +50,10 @@ jobs:
3750
steps:
3851
- uses: actions/checkout@v3
3952

53+
- name: Install required packages / compilers
54+
if: ${{ matrix.install }}
55+
run: ${{ matrix.install }}
56+
4057
- uses: lukka/get-cmake@latest
4158
with:
4259
cmakeVersion: 3.22.6
@@ -81,12 +98,12 @@ jobs:
8198
steps:
8299
- uses: actions/checkout@v3
83100

84-
- name: "Install clang-tools-15"
101+
- name: "Install clang-tools-16"
85102
run: |
86103
sudo cp ${{ github.workspace }}/tools/llvm-snapshot.gpg.key.asc /etc/apt/trusted.gpg.d/llvm-snapshot.asc
87-
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
104+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
88105
sudo apt-get -qq update
89-
sudo apt-get -qq -y install clang-15 clang-tidy-15 clang-format-15
106+
sudo apt-get -qq -y install clang-16 clang-tidy-16 clang-format-16
90107
91108
- uses: lukka/get-cmake@latest
92109
with:
@@ -109,7 +126,7 @@ jobs:
109126
env:
110127
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111128
with:
112-
version: 15.0.7
129+
version: 16.0.6
113130
style: file # use .clang-format settings
114131
tidy-checks: '' # use .clang-tidy settings
115132
extensions: cpp,hpp

‎CMakePresets.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@
126126
"x64-linux"
127127
],
128128
"cacheVariables": {
129-
"VCPKG_TARGET_TRIPLET": "x64-linux-clang",
130-
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-linux-clang.cmake"
129+
"VCPKG_TARGET_TRIPLET": "x64-linux-clang-16",
130+
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-linux-clang-16.cmake"
131131
}
132132
},
133133
{
@@ -136,8 +136,8 @@
136136
"x64-linux-clang"
137137
],
138138
"cacheVariables": {
139-
"VCPKG_TARGET_TRIPLET": "x64-linux-clang-15",
140-
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-linux-clang-15.cmake",
139+
"VCPKG_TARGET_TRIPLET": "x64-linux-clang-16",
140+
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-linux-clang-16.cmake",
141141
"CMAKE_EXPORT_COMPILE_COMMANDS": true
142142
}
143143
},
@@ -171,8 +171,8 @@
171171
"name": "x64-macos-clang",
172172
"inherits": [ "x64-macos" ],
173173
"cacheVariables": {
174-
"VCPKG_TARGET_TRIPLET": "x64-osx-clang-15-brew",
175-
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-macos-clang-15-brew.cmake"
174+
"VCPKG_TARGET_TRIPLET": "x64-osx-clang-16-brew",
175+
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-macos-clang-16-brew.cmake"
176176
}
177177
},
178178
{

tools/toolchains/x64-linux-clang-15.cmake renamed to tools/toolchains/x64-linux-clang-16.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CMAKE_SYSTEM_PROCESSOR AMD64)
22

3-
set(CMAKE_C_COMPILER clang-15)
4-
set(CMAKE_CXX_COMPILER clang++-15)
3+
set(CMAKE_C_COMPILER clang-16)
4+
set(CMAKE_CXX_COMPILER clang++-16)
55

66
set(CMAKE_C_STANDARD 17)
77
set(CMAKE_CXX_STANDARD 20)

tools/toolchains/x64-macos-clang-15-brew.cmake renamed to tools/toolchains/x64-macos-clang-16-brew.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
set(CMAKE_SYSTEM_PROCESSOR AMD64)
22

3-
execute_process(COMMAND brew --prefix llvm@15 OUTPUT_VARIABLE BREW_LLVM_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
3+
execute_process(COMMAND brew --prefix llvm@16 OUTPUT_VARIABLE BREW_LLVM_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
44

55
set(CMAKE_C_COMPILER "${BREW_LLVM_PATH}/bin/clang")
66
set(CMAKE_CXX_COMPILER "${BREW_LLVM_PATH}/bin/clang++")
7-
set(CMAKE_OSX_SYSROOT /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
7+
set(CMAKE_OSX_SYSROOT /Applications/Xcode_15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
88

99
set(CMAKE_C_STANDARD 17)
1010
set(CMAKE_CXX_STANDARD 20)

‎tools/toolchains/x64-macos-gcc-12.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_PROCESSOR AMD64)
22

33
set(CMAKE_C_COMPILER gcc-12)
44
set(CMAKE_CXX_COMPILER g++-12)
5-
set(CMAKE_OSX_SYSROOT /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
5+
set(CMAKE_OSX_SYSROOT /Applications/Xcode_15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
66

77
set(CMAKE_C_STANDARD 17)
88
set(CMAKE_CXX_STANDARD 20)

tools/triplets/x64-linux-clang-15.cmake renamed to tools/triplets/x64-linux-clang-16.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ set(VCPKG_CRT_LINKAGE dynamic)
33
set(VCPKG_LIBRARY_LINKAGE static)
44

55
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
6-
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../toolchains/x64-linux-clang-15.cmake")
6+
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../toolchains/x64-linux-clang-16.cmake")

tools/triplets/x64-osx-clang-15-brew.cmake renamed to tools/triplets/x64-osx-clang-16-brew.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ set(VCPKG_LIBRARY_LINKAGE static)
44

55
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
66
set(VCPKG_OSX_ARCHITECTURES x86_64)
7-
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../toolchains/x64-macos-clang-15-brew.cmake")
7+
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../toolchains/x64-macos-clang-16-brew.cmake")
8+
9+
if (PORT STREQUALS "status-code")
10+
set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DBUILD_TESTING=OFF")
11+
endif()

0 commit comments

Comments
 (0)