Skip to content

Commit 2a6b9cf

Browse files
committed
build: require LLVM 22
1 parent c8cdd98 commit 2a6b9cf

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/linux-asserts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
llvm-version: [21]
19+
llvm-version: [22]
2020
env:
2121
LLVM_VERSION: ${{ matrix.llvm-version }}
2222
steps:

.github/workflows/linux_smoke-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
llvm-version: [21]
19+
llvm-version: [22]
2020
env:
2121
LLVM_VERSION: ${{ matrix.llvm-version }}
2222
LLVM_BIN: /usr/lib/llvm-${{ matrix.llvm-version }}/bin

.github/workflows/macOS_smoke-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
llvm-version: [21]
19+
llvm-version: [22]
2020
env:
2121
LLVM_VERSION: ${{ matrix.llvm-version }}
2222
steps:

.github/workflows/sonarQube.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
runs-on: ubuntu-latest
1010
env:
1111
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
12-
LLVM_VERSION: 21
13-
LLVM_DIR: /usr/lib/llvm-21/lib/cmake/llvm
14-
LLVM_BIN: /usr/lib/llvm-21/bin
12+
LLVM_VERSION: 22
13+
LLVM_DIR: /usr/lib/llvm-22/lib/cmake/llvm
14+
LLVM_BIN: /usr/lib/llvm-22/bin
1515
steps:
1616
- uses: actions/checkout@v4
1717
with:

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1313

1414
project(Glu CXX C)
1515

16-
set(GLU_LLVM_VERSION "21" CACHE STRING "LLVM major version to use (supported: 21)")
16+
set(GLU_LLVM_VERSION "22" CACHE STRING "LLVM major version to use (supported: 22)")
1717

18-
if(GLU_LLVM_VERSION STREQUAL "21")
19-
set(GLU_LLVM_VERSION_REQUIRED "21.1")
20-
set(GLU_LLVM_GIT_TAG "llvmorg-21.1.6")
21-
elseif(GLU_LLVM_VERSION STREQUAL "22")
18+
if(GLU_LLVM_VERSION STREQUAL "22")
2219
set(GLU_LLVM_VERSION_REQUIRED "22.1")
2320
set(GLU_LLVM_GIT_TAG "llvmorg-22.1.0")
2421
else()
25-
message(FATAL_ERROR "Unsupported LLVM version '${GLU_LLVM_VERSION}'. Supported versions: 21")
22+
message(FATAL_ERROR
23+
"Unsupported LLVM version '${GLU_LLVM_VERSION}'. Supported versions: 22. "
24+
"If you need LLVM 19, 20, or 21 support, please use an older Glu release."
25+
)
2626
endif()
2727

2828
message(STATUS "Configuring Glu with LLVM ${GLU_LLVM_VERSION} (find_package >= ${GLU_LLVM_VERSION_REQUIRED})")

0 commit comments

Comments
 (0)