mirror of
https://github.com/JakeHillion/object-introspection.git
synced 2024-09-19 19:19:05 +01:00
support and test LLVM versions 16 and 17
This commit is contained in:
parent
c7682c487e
commit
f349ba3316
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -18,7 +18,7 @@ jobs:
|
|||||||
runs-on: 16-core-ubuntu
|
runs-on: 16-core-ubuntu
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
llvm_version: [15]
|
llvm_version: [15, 16, 17]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.7
|
- uses: actions/checkout@v4.1.7
|
||||||
- uses: cachix/install-nix-action@v27
|
- uses: cachix/install-nix-action@v27
|
||||||
|
2
.github/workflows/test-report.yml
vendored
2
.github/workflows/test-report.yml
vendored
@ -14,7 +14,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: dorny/test-reporter@v1
|
- uses: dorny/test-reporter@v1
|
||||||
with:
|
with:
|
||||||
artifact: test-results-15
|
artifact: test-results-17
|
||||||
name: CTest Tests
|
name: CTest Tests
|
||||||
path: results.xml
|
path: results.xml
|
||||||
reporter: jest-junit
|
reporter: jest-junit
|
||||||
|
@ -219,11 +219,15 @@ find_package(Boost REQUIRED COMPONENTS
|
|||||||
)
|
)
|
||||||
message(STATUS "Linking Boost libraries: ${Boost_LIBRARIES}")
|
message(STATUS "Linking Boost libraries: ${Boost_LIBRARIES}")
|
||||||
|
|
||||||
### LLVM and Clang - Preferring Clang 15
|
### LLVM and Clang
|
||||||
find_package(LLVM 15 REQUIRED CONFIG)
|
find_package(LLVM REQUIRED CONFIG)
|
||||||
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
|
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
|
||||||
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
|
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
|
||||||
|
|
||||||
|
if((${LLVM_VERSION_MAJOR} VERSION_LESS 15) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER 17))
|
||||||
|
message(SEND_ERROR "Object Introspection currently requires an LLVM version between 15 and 17!")
|
||||||
|
endif()
|
||||||
|
|
||||||
find_package(Clang REQUIRED CONFIG)
|
find_package(Clang REQUIRED CONFIG)
|
||||||
message(STATUS "Found Clang ${LLVM_PACKAGE_VERSION}")
|
message(STATUS "Found Clang ${LLVM_PACKAGE_VERSION}")
|
||||||
message(STATUS "Using ClangConfig.cmake in: ${Clang_DIR}")
|
message(STATUS "Using ClangConfig.cmake in: ${Clang_DIR}")
|
||||||
|
@ -99,9 +99,11 @@
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
packages = rec {
|
packages = rec {
|
||||||
default = oid-llvm15;
|
default = oid-llvm17;
|
||||||
|
|
||||||
oid-llvm15 = mkOidPackage pkgs.llvmPackages_15;
|
oid-llvm15 = mkOidPackage pkgs.llvmPackages_15;
|
||||||
|
oid-llvm16 = mkOidPackage pkgs.llvmPackages_16;
|
||||||
|
oid-llvm17 = mkOidPackage pkgs.llvmPackages_17;
|
||||||
};
|
};
|
||||||
|
|
||||||
apps.default = {
|
apps.default = {
|
||||||
|
Loading…
Reference in New Issue
Block a user