Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions recipes/level-zero/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
sources:
"1.27.0":
url: "https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.27.0.tar.gz"
sha256: "b9f5d6c661a23cad78db1552c4951a1bb6f1628e4f737c68e69c3a23d64db2eb"
"1.17.39":
url: "https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.17.39.tar.gz"
sha256: "70473c7262eee80dbe7c17974684ba9d3e34efc15ecba919b85e3cea7b1e180e"
patches:
"1.27.0":
- patch_file: "patches/1.27.0/001-remove-qspectre.patch"
patch_description: "Removed /Qspectre"
patch_type: "portability"
"1.17.39":
- patch_file: "patches/1.17.39/001-patch-remove-qspectre.patch"
patch_description: "Removed /Qspectre"
Expand Down
17 changes: 17 additions & 0 deletions recipes/level-zero/all/patches/1.27.0/001-remove-qspectre.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd511c3..6d1c2fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,12 +93,10 @@ if(MSVC)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_CXX_LINKER_WRAPPER_FLAG}/LTCG /INCREMENTAL:NO")
# enable flags, that are not supported or unused by clang-cl
if((NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang) AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM))
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GL")
endif()
if((NOT CMAKE_C_COMPILER_ID STREQUAL Clang) AND NOT (CMAKE_C_COMPILER_ID STREQUAL IntelLLVM))
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /guard:cf")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /GL")
endif()
2 changes: 1 addition & 1 deletion recipes/level-zero/all/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.2.0)
cmake_minimum_required(VERSION 3.6.0)
project(test_package LANGUAGES CXX)

find_package(level-zero CONFIG REQUIRED)
Expand Down
5 changes: 5 additions & 0 deletions recipes/level-zero/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from conan import ConanFile
from conan.tools.build import can_run
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.errors import ConanInvalidConfiguration
import os


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

def requirements(self):
self.requires(self.tested_reference_str)

def validate(self):
if self.settings.os not in ("Windows", "Linux"):
raise ConanInvalidConfiguration(f"{self.settings.os} is not supported")

def layout(self):
cmake_layout(self)
Expand Down
2 changes: 2 additions & 0 deletions recipes/level-zero/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"1.17.39":
folder: "all"
"1.27.0":
folder: "all"