1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From 385f67c0b9a0eda6a65c56616e84bb2d612f82cf Mon Sep 17 00:00:00 2001
From: Jakub Czarnecki <jakub.czarnecki@intel.com>
Date: Thu, 15 Dec 2022 12:07:06 +0000
Subject: [PATCH] Preinstalled SPIRV-Tools CMakeFile fix
Corrected typos and missing characters from the SPIRV-Tools CMakeFile,
added add_custom_target to allow marking preinstalled SPIRV-Tools as a
target.
---
external/SPIRV-Tools/CMakeLists.txt | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
index 076079f7c..9afa5746c 100644
--- a/external/SPIRV-Tools/CMakeLists.txt
+++ b/external/SPIRV-Tools/CMakeLists.txt
@@ -13,14 +13,14 @@ message(STATUS "============================ SPIRV-Tools project ===============
if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
message(STATUS "[SPIRV-Tools] : IGC_OPTION__SPIRV_TOOLS_MODE set to Prebuilds")
- OPTION(IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS OFF)
+ OPTION(IGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS OFF)
- if(IGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS)
- message(STATUS "[SPIRV-Tools] : IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS set to ON, using preinstalled SPIRV-Headers")
+ if(IGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS)
+ message(STATUS "[SPIRV-Tools] : IGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS set to ON, using preinstalled SPIRV-Headers")
message(STATUS "[SPIRV-Tools] : Using preinstalled SPIRV-Headers")
set(SPIRV-Headers_INCLUDE_DIR "/usr/include")
else()
- message(STATUS "[SPIRV-Tools] : IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS set to OFF")
+ message(STATUS "[SPIRV-Tools] : IGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS set to OFF")
message(STATUS "[SPIRV-Tools] : Using default path ${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Headers")
set(SPIRV-Headers_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Headers/include")
endif()
@@ -29,10 +29,11 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
find_package(SPIRV-Tools REQUIRED COMPONENTS SPIRV-Tools)
message(STATUS "[SPIRV-Tools] : Found prebuilt SPIRV-Tools package in: ${SPIRV-Tools_CONFIG}")
- set(SPIRV-Tools_ROOT_DIR "${SPIRV-Tools_DIR}../../..")
+ set(SPIRV-Tools_ROOT_DIR "${SPIRV-Tools_DIR}/../../..")
set(IGC_BUILD__SPIRV-Tools_DIR "${SPIRV-Tools_ROOT_DIR}")
set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}")
+ add_custom_target(SPIRV-Tools)
set_target_properties(SPIRV-Tools PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
--
2.20.1
|
