Skip to content

Commit bfb7a55

Browse files
committed
level-zero: update to 1.27.0
1 parent fcf375e commit bfb7a55

File tree

5 files changed

+32
-1
lines changed

5 files changed

+32
-1
lines changed

recipes/level-zero/all/conandata.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
sources:
2+
"1.27.0":
3+
url: "https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.27.0.tar.gz"
4+
sha256: "b9f5d6c661a23cad78db1552c4951a1bb6f1628e4f737c68e69c3a23d64db2eb"
25
"1.17.39":
36
url: "https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.17.39.tar.gz"
47
sha256: "70473c7262eee80dbe7c17974684ba9d3e34efc15ecba919b85e3cea7b1e180e"
58
patches:
9+
"1.27.0":
10+
- patch_file: "patches/1.27.0/001-remove-qspectre.patch"
11+
patch_description: "Removed /Qspectre"
12+
patch_type: "portability"
613
"1.17.39":
714
- patch_file: "patches/1.17.39/001-patch-remove-qspectre.patch"
815
patch_description: "Removed /Qspectre"
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index dd511c3..6d1c2fc 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -93,12 +93,10 @@ if(MSVC)
6+
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_CXX_LINKER_WRAPPER_FLAG}/LTCG /INCREMENTAL:NO")
7+
# enable flags, that are not supported or unused by clang-cl
8+
if((NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang) AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM))
9+
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
10+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
11+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GL")
12+
endif()
13+
if((NOT CMAKE_C_COMPILER_ID STREQUAL Clang) AND NOT (CMAKE_C_COMPILER_ID STREQUAL IntelLLVM))
14+
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
15+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /guard:cf")
16+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /GL")
17+
endif()

recipes/level-zero/all/test_package/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.2.0)
1+
cmake_minimum_required(VERSION 3.6.0)
22
project(test_package LANGUAGES CXX)
33

44
find_package(level-zero CONFIG REQUIRED)

recipes/level-zero/all/test_package/conanfile.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from conan import ConanFile
22
from conan.tools.build import can_run
33
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
4+
from conan.errors import ConanInvalidConfiguration
45
import os
56

67

@@ -11,6 +12,10 @@ class TestPackageConan(ConanFile):
1112

1213
def requirements(self):
1314
self.requires(self.tested_reference_str)
15+
16+
def validate(self):
17+
if self.settings.os not in ("Windows", "Linux"):
18+
raise ConanInvalidConfiguration(f"{self.settings.os} is not supported")
1419

1520
def layout(self):
1621
cmake_layout(self)

recipes/level-zero/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
versions:
22
"1.17.39":
33
folder: "all"
4+
"1.27.0":
5+
folder: "all"

0 commit comments

Comments
 (0)