summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/clang-layer/recipes-opencl/igc/files/991fd3d661efcb4fb6df63b76310d6e634b05c39.patch
blob: bcf31fda26168b417c1b83f65444caa2405710a5 (plain)
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
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
From 991fd3d661efcb4fb6df63b76310d6e634b05c39 Mon Sep 17 00:00:00 2001
From: "Grzywacz, Maciej" <maciej.grzywacz@intel.com>
Date: Tue, 10 May 2022 09:44:09 +0000
Subject: [PATCH]  Fix IGC OS linux buildbreak

Fix finding lldelf and SpirvLLVMTranslator

Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 IGC/cmake/igc_find_liblldELF.cmake            | 128 +++++----
 .../modules/FindSPIRVLLVMTranslator.cmake     | 271 +++++++++++-------
 2 files changed, 252 insertions(+), 147 deletions(-)

diff --git a/IGC/cmake/igc_find_liblldELF.cmake b/IGC/cmake/igc_find_liblldELF.cmake
index b014910d2e9..c6d5765d5df 100644
--- a/IGC/cmake/igc_find_liblldELF.cmake
+++ b/IGC/cmake/igc_find_liblldELF.cmake
@@ -10,61 +10,89 @@
 #   IGC_OPTION__LLDELF_H_DIR - Specify additional directories for searching lldELF headers
 
 function(add_lld_library LIB_NAME)
-  find_library(${LIB_NAME}_PATH_RELEASE
-    ${LIB_NAME}
-    PATHS "${IGC_OPTION__LLD_DIR}/Release/lib"
-    PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
-
-  if("${${LIB_NAME}_PATH_RELEASE}" STREQUAL "${LIB_NAME}_PATH_RELEASE-NOTFOUND")
-    message(FATAL_ERROR
-    "Cannot find ${LIB_NAME} library in Release version in ${IGC_OPTION__LLD_DIR}")
-  endif()
-
-  find_library(${LIB_NAME}_PATH_DEBUG
-    ${LIB_NAME}
-    PATHS "${IGC_OPTION__LLD_DIR}/Debug/lib"
-    PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
-
-  if("${${LIB_NAME}_PATH_DEBUG}" STREQUAL "${LIB_NAME}_PATH_DEBUG-NOTFOUND")
-    message(FATAL_ERROR
-    "Cannot find ${LIB_NAME} library in Debug version in ${IGC_OPTION__LLD_DIR}")
+  if(WIN32)
+    find_library(${LIB_NAME}_PATH_RELEASE
+      ${LIB_NAME}
+      PATHS "${IGC_OPTION__LLD_DIR}/Release/lib"
+      PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
+
+    if("${${LIB_NAME}_PATH_RELEASE}" STREQUAL "${LIB_NAME}_PATH_RELEASE-NOTFOUND")
+      message(FATAL_ERROR
+      "Cannot find ${LIB_NAME} library in Release version in ${IGC_OPTION__LLD_DIR}")
+    endif()
+
+    find_library(${LIB_NAME}_PATH_DEBUG
+      ${LIB_NAME}
+      PATHS "${IGC_OPTION__LLD_DIR}/Debug/lib"
+      PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
+
+    if("${${LIB_NAME}_PATH_DEBUG}" STREQUAL "${LIB_NAME}_PATH_DEBUG-NOTFOUND")
+      message(FATAL_ERROR
+      "Cannot find ${LIB_NAME} library in Debug version in ${IGC_OPTION__LLD_DIR}")
+    endif()
+
+    add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
+    set_target_properties(${LIB_NAME} PROPERTIES
+      IMPORTED_LOCATION_RELEASE "${${LIB_NAME}_PATH_RELEASE}"
+      IMPORTED_LOCATION_RELEASEINTERNAL "${${LIB_NAME}_PATH_RELEASE}"
+      IMPORTED_LOCATION_DEBUG "${${LIB_NAME}_PATH_DEBUG}"
+      )
+  else()
+    find_library(${LIB_NAME}_PATH
+      ${LIB_NAME}
+      PATHS "${IGC_OPTION__LLDELF_LIB_DIR}"
+      PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
+
+    if(${LIB_NAME}_PATH-NOTFOUND)
+      message(FATAL_ERROR
+      "Cannot find ${LIB_NAME} library, please install missing library or provide the path by IGC_OPTION__LLDELF_LIB_DIR")
+    endif()
+    add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
+    set_target_properties(${LIB_NAME} PROPERTIES IMPORTED_LOCATION ${${LIB_NAME}_PATH})
   endif()
-
-  add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
-  set_target_properties(${LIB_NAME} PROPERTIES
-    IMPORTED_LOCATION_RELEASE "${${LIB_NAME}_PATH_RELEASE}"
-    IMPORTED_LOCATION_RELEASEINTERNAL "${${LIB_NAME}_PATH_RELEASE}"
-    IMPORTED_LOCATION_DEBUG "${${LIB_NAME}_PATH_DEBUG}"
-    )
 endfunction()
 
 function(add_lld_executable EXE_NAME)
-  find_program(${EXE_NAME}_PATH_RELEASE
-    ${EXE_NAME}
-    PATHS "${IGC_OPTION__LLD_DIR}/Release/bin"
-    PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
-
-  if("${${EXE_NAME}_PATH_RELEASE}" STREQUAL "${EXE_NAME}_PATH_RELEASE-NOTFOUND")
-    message(FATAL_ERROR
-    "Cannot find ${EXE_NAME} executable in Release version in ${IGC_OPTION__LLD_DIR}")
+  if(WIN32)
+    find_program(${EXE_NAME}_PATH_RELEASE
+      ${EXE_NAME}
+      PATHS "${IGC_OPTION__LLD_DIR}/Release/bin"
+      PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
+
+    if("${${EXE_NAME}_PATH_RELEASE}" STREQUAL "${EXE_NAME}_PATH_RELEASE-NOTFOUND")
+      message(FATAL_ERROR
+      "Cannot find ${EXE_NAME} executable in Release version in ${IGC_OPTION__LLD_DIR}")
+    endif()
+
+    find_program(${EXE_NAME}_PATH_DEBUG
+      ${EXE_NAME}
+      PATHS "${IGC_OPTION__LLD_DIR}/Debug/bin"
+      PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
+
+    if("${${EXE_NAME}_PATH_DEBUG}" STREQUAL "${EXE_NAME}_PATH_DEBUG-NOTFOUND")
+      message(FATAL_ERROR
+      "Cannot find ${EXE_NAME} executable in Debug version in ${IGC_OPTION__LLD_DIR}")
+    endif()
+
+    add_executable(${EXE_NAME} IMPORTED GLOBAL)
+    set_target_properties(${EXE_NAME} PROPERTIES
+      IMPORTED_LOCATION_RELEASE "${${EXE_NAME}_PATH_RELEASE}"
+      IMPORTED_LOCATION_RELEASEINTERNAL "${${EXE_NAME}_PATH_RELEASE}"
+      IMPORTED_LOCATION_DEBUG "${${EXE_NAME}_PATH_DEBUG}"
+      )
+  else()
+    find_program(${EXE_NAME}_PATH
+      ${EXE_NAME}
+      PATHS "${IGC_OPTION__LLD_BIN_DIR}"
+      PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
+
+    if(${EXE_NAME}_PATH-NOTFOUND)
+      message(FATAL_ERROR "Cannot find ${EXE_NAME} executable, please install missing executable or provide the path by IGC_OPTION__LLD_BIN_DIR")
+    endif()
+
+    add_executable(${EXE_NAME} IMPORTED GLOBAL)
+    set_target_properties(${EXE_NAME} PROPERTIES IMPORTED_LOCATION ${${EXE_NAME}_PATH})
   endif()
-
-  find_program(${EXE_NAME}_PATH_DEBUG
-    ${EXE_NAME}
-    PATHS "${IGC_OPTION__LLD_DIR}/Debug/bin"
-    PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
-
-  if("${${EXE_NAME}_PATH_DEBUG}" STREQUAL "${EXE_NAME}_PATH_DEBUG-NOTFOUND")
-    message(FATAL_ERROR
-    "Cannot find ${EXE_NAME} executable in Debug version in ${IGC_OPTION__LLD_DIR}")
-  endif()
-
-  add_executable(${EXE_NAME} IMPORTED GLOBAL)
-  set_target_properties(${EXE_NAME} PROPERTIES
-  IMPORTED_LOCATION_RELEASE "${${EXE_NAME}_PATH_RELEASE}"
-  IMPORTED_LOCATION_RELEASEINTERNAL "${${EXE_NAME}_PATH_RELEASE}"
-  IMPORTED_LOCATION_DEBUG "${${EXE_NAME}_PATH_DEBUG}"
-  )
 endfunction()
 
 if(IGC_BUILD__LLVM_SOURCES)
diff --git a/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake b/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
index de2ff5baad1..0d8d00b4a5d 100644
--- a/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
+++ b/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
@@ -15,109 +15,186 @@
 # Optionally, llvm-spirv tool will be checked and LLVMSPIRVTranslator_Tool_FOUND
 # will be set to true and llvm-spirv executable target will be defined.
 
-find_library(SPIRVLLVMTranslator_Library_Release LLVMSPIRVLib PATHS "${LLVM_DIR}/Release/lib")
-find_library(SPIRVLLVMTranslator_Library_Debug LLVMSPIRVLib PATHS "${LLVM_DIR}/Debug/lib")
-
-find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
-  PATH_SUFFIXES LLVMSPIRVLib
-  PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
-  )
-
-# Try to find version and llvm-spirv.
-if(SPIRVLLVMTranslator_Library_Release AND SPIRVLLVMTranslator_Library_Debug)
-  set(SPIRVLLVMTranslator_Library_FOUND YES)
-
-  get_filename_component(_libdir_Release ${SPIRVLLVMTranslator_Library_Release} DIRECTORY)
-  get_filename_component(_libdir_Debug ${SPIRVLLVMTranslator_Library_Debug} DIRECTORY)
-
-  # Get library version. Manual parsing is used because it is quite easy and
-  # will work for both linux and windows (which is lacking pkg-config).
-  file(STRINGS "${_libdir_Release}/pkgconfig/LLVMSPIRVLib.pc" _version_file_release
-    REGEX "Version: .*")
-  file(STRINGS "${_libdir_Debug}/pkgconfig/LLVMSPIRVLib.pc" _version_file_debug
-    REGEX "Version: .*")
-
-  if(NOT _version_file_release OR NOT _version_file_debug)
-    message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
+if(WIN32)
+  find_library(SPIRVLLVMTranslator_Library_Release LLVMSPIRVLib PATHS "${LLVM_DIR}/Release/lib")
+  find_library(SPIRVLLVMTranslator_Library_Debug LLVMSPIRVLib PATHS "${LLVM_DIR}/Debug/lib")
+
+  find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
+    PATH_SUFFIXES LLVMSPIRVLib
+    PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
+    )
+
+  # Try to find version and llvm-spirv.
+  if(SPIRVLLVMTranslator_Library_Release AND SPIRVLLVMTranslator_Library_Debug)
+    set(SPIRVLLVMTranslator_Library_FOUND YES)
+
+    get_filename_component(_libdir_Release ${SPIRVLLVMTranslator_Library_Release} DIRECTORY)
+    get_filename_component(_libdir_Debug ${SPIRVLLVMTranslator_Library_Debug} DIRECTORY)
+
+    # Get library version. Manual parsing is used because it is quite easy and
+    # will work for both linux and windows (which is lacking pkg-config).
+    file(STRINGS "${_libdir_Release}/pkgconfig/LLVMSPIRVLib.pc" _version_file_release
+      REGEX "Version: .*")
+    file(STRINGS "${_libdir_Debug}/pkgconfig/LLVMSPIRVLib.pc" _version_file_debug
+      REGEX "Version: .*")
+
+    if(NOT _version_file_release OR NOT _version_file_debug)
+      message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
+    endif()
+    string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Release "${_version_file_release}")
+    string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Debug "${_version_file_debug}")
+    set(SPIRVLLVMTranslator_VERSION_Release ${SPIRVLLVMTranslator_VERSION_Release} CACHE STRING "SPIRVLLVMTranslator release version")
+    set(SPIRVLLVMTranslator_VERSION_Debug ${SPIRVLLVMTranslator_VERSION_Debug} CACHE STRING "SPIRVLLVMTranslator debug version")
+
+    # Try to find llvm-spirv.
+    find_program(SPIRVLLVMTranslator_Tool_Release llvm-spirv
+      PATHS ${_libdir_Release}/../bin
+      NO_DEFAULT_PATH
+      )
+    find_program(SPIRVLLVMTranslator_Tool_Debug llvm-spirv
+      PATHS ${_libdir_Debug}/../bin
+      NO_DEFAULT_PATH
+      )
+
+    if(SPIRVLLVMTranslator_Tool_Release AND SPIRVLLVMTranslator_Tool_Debug)
+      set(SPIRVLLVMTranslator_Tool_FOUND YES)
+    endif()
+
+    unset(_libdir)
   endif()
-  string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Release "${_version_file_release}")
-  string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Debug "${_version_file_debug}")
-  set(SPIRVLLVMTranslator_VERSION_Release ${SPIRVLLVMTranslator_VERSION_Release} CACHE STRING "SPIRVLLVMTranslator release version")
-  set(SPIRVLLVMTranslator_VERSION_Debug ${SPIRVLLVMTranslator_VERSION_Debug} CACHE STRING "SPIRVLLVMTranslator debug version")
-
-  # Try to find llvm-spirv.
-  find_program(SPIRVLLVMTranslator_Tool_Release llvm-spirv
-    PATHS ${_libdir_Release}/../bin
-    NO_DEFAULT_PATH
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(SPIRVLLVMTranslator_Release
+    REQUIRED_VARS SPIRVLLVMTranslator_Library_Release SPIRVLLVMTranslator_INCLUDE_DIR
+    VERSION_VAR SPIRVLLVMTranslator_VERSION_Release
+    HANDLE_COMPONENTS
     )
-  find_program(SPIRVLLVMTranslator_Tool_Debug llvm-spirv
-    PATHS ${_libdir_Debug}/../bin
-    NO_DEFAULT_PATH
+  find_package_handle_standard_args(SPIRVLLVMTranslator_Debug
+    REQUIRED_VARS SPIRVLLVMTranslator_Library_Debug SPIRVLLVMTranslator_INCLUDE_DIR
+    VERSION_VAR SPIRVLLVMTranslator_VERSION_Debug
+    HANDLE_COMPONENTS
     )
 
-  if(SPIRVLLVMTranslator_Tool_Release AND SPIRVLLVMTranslator_Tool_Debug)
-    set(SPIRVLLVMTranslator_Tool_FOUND YES)
+  # Mark all cached variables as advanced.
+  if(SPIRVLLVMTranslator_Release_FOUND)
+    mark_as_advanced(SPIRVLLVMTranslator_Library_Release)
+    mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
+    mark_as_advanced(SPIRVLLVMTranslator_VERSION_Release)
   endif()
 
-  unset(_libdir)
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SPIRVLLVMTranslator_Release
-  REQUIRED_VARS SPIRVLLVMTranslator_Library_Release SPIRVLLVMTranslator_INCLUDE_DIR
-  VERSION_VAR SPIRVLLVMTranslator_VERSION_Release
-  HANDLE_COMPONENTS
-  )
-find_package_handle_standard_args(SPIRVLLVMTranslator_Debug
-  REQUIRED_VARS SPIRVLLVMTranslator_Library_Debug SPIRVLLVMTranslator_INCLUDE_DIR
-  VERSION_VAR SPIRVLLVMTranslator_VERSION_Debug
-  HANDLE_COMPONENTS
-  )
-
-# Mark all cached variables as advanced.
-if(SPIRVLLVMTranslator_Release_FOUND)
-  mark_as_advanced(SPIRVLLVMTranslator_Library_Release)
-  mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
-  mark_as_advanced(SPIRVLLVMTranslator_VERSION_Release)
-endif()
-
-if(SPIRVLLVMTranslator_Debug_FOUND)
-  mark_as_advanced(SPIRVLLVMTranslator_Library_Debug)
-  mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
-  mark_as_advanced(SPIRVLLVMTranslator_VERSION_Debug)
-endif()
-
-if(SPIRVLLVMTranslator_Tool_Release_FOUND)
-  mark_as_advanced(SPIRVLLVMTranslator_Tool_Release)
-endif()
-
-if(SPIRVLLVMTranslator_Tool_Debug_FOUND)
-mark_as_advanced(SPIRVLLVMTranslator_Tool_Debug)
-endif()
-
-# Add interface target for library.
-if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
-  add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
-  set_target_properties(LLVMSPIRVLib PROPERTIES
-    IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Library_Release}"
-    IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Library_Release}"
-    IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Library_Debug}"
-    INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
-    )
-endif()
+  if(SPIRVLLVMTranslator_Debug_FOUND)
+    mark_as_advanced(SPIRVLLVMTranslator_Library_Debug)
+    mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
+    mark_as_advanced(SPIRVLLVMTranslator_VERSION_Debug)
+  endif()
+
+  if(SPIRVLLVMTranslator_Tool_Release_FOUND)
+    mark_as_advanced(SPIRVLLVMTranslator_Tool_Release)
+  endif()
+
+  if(SPIRVLLVMTranslator_Tool_Debug_FOUND)
+  mark_as_advanced(SPIRVLLVMTranslator_Tool_Debug)
+  endif()
+
+  # Add interface target for library.
+  if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
+    add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
+    set_target_properties(LLVMSPIRVLib PROPERTIES
+      IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Library_Release}"
+      IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Library_Release}"
+      IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Library_Debug}"
+      INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+      )
+  endif()
+
+  if (NOT IGC_BUILD__SPIRV_TRANSLATOR_SOURCES)
+    set_target_properties(LLVMSPIRVLib PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+      )
+  endif()
 
-if (NOT IGC_BUILD__SPIRV_TRANSLATOR_SOURCES)
-  set_target_properties(LLVMSPIRVLib PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+  # Add interface target for llvm-spirv.
+  if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
+    add_executable(llvm-spirv IMPORTED)
+    set_target_properties(llvm-spirv PROPERTIES
+      IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Tool_Release}"
+      IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Tool_Release}"
+      IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Tool_Debug}"
+      )
+  endif()
+else()
+  find_library(SPIRVLLVMTranslator_Library LLVMSPIRVLib PATHS ${LLVM_LIB_DIR})
+  find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
+    PATH_SUFFIXES LLVMSPIRVLib
+    PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
     )
-endif()
-
-# Add interface target for llvm-spirv.
-if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
-  add_executable(llvm-spirv IMPORTED)
-  set_target_properties(llvm-spirv PROPERTIES
-    IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Tool_Release}"
-    IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Tool_Release}"
-    IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Tool_Debug}"
+
+  # Try to find version and llvm-spirv.
+  if(SPIRVLLVMTranslator_Library)
+    set(SPIRVLLVMTranslator_Library_FOUND YES)
+
+    get_filename_component(_libdir ${SPIRVLLVMTranslator_Library} DIRECTORY)
+
+    # Get library version. Manual parsing is used because it is quite easy and
+    # will work for both linux and windows (which is lacking pkg-config).
+    file(STRINGS "${_libdir}/pkgconfig/LLVMSPIRVLib.pc" _version_file
+      REGEX "Version: .*")
+    if(NOT _version_file)
+      message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
+    endif()
+    string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION "${_version_file}")
+    set(SPIRVLLVMTranslator_VERSION ${SPIRVLLVMTranslator_VERSION} CACHE STRING "SPIRVLLVMTranslator version")
+
+    # Try to find llvm-spirv.
+    find_program(SPIRVLLVMTranslator_Tool llvm-spirv
+      PATHS ${_libdir}/../bin
+      NO_DEFAULT_PATH
+      )
+    if(SPIRVLLVMTranslator_Tool)
+      set(SPIRVLLVMTranslator_Tool_FOUND YES)
+    endif()
+
+    unset(_libdir)
+  endif()
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(SPIRVLLVMTranslator
+    REQUIRED_VARS SPIRVLLVMTranslator_Library SPIRVLLVMTranslator_INCLUDE_DIR
+    VERSION_VAR SPIRVLLVMTranslator_VERSION
+    HANDLE_COMPONENTS
     )
-endif()
+
+  # Mark all cached variables as advanced.
+  if(SPIRVLLVMTranslator_FOUND)
+    mark_as_advanced(SPIRVLLVMTranslator_Library)
+    mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
+    mark_as_advanced(SPIRVLLVMTranslator_VERSION)
+  endif()
+
+  if(SPIRVLLVMTranslator_Tool_FOUND)
+    mark_as_advanced(SPIRVLLVMTranslator_Tool)
+  endif()
+
+  # Add interface target for library.
+  if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
+    add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
+    set_target_properties(LLVMSPIRVLib PROPERTIES
+      IMPORTED_LOCATION ${SPIRVLLVMTranslator_Library}
+      INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+      )
+  endif()
+
+  if (NOT IGC_BUILD__SPIRV_TRANSLATOR_SOURCES)
+    set_target_properties(LLVMSPIRVLib PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+      )
+  endif()
+
+  # Add interface target for llvm-spirv.
+  if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
+    add_executable(llvm-spirv IMPORTED)
+    set_target_properties(llvm-spirv PROPERTIES
+      IMPORTED_LOCATION ${SPIRVLLVMTranslator_Tool}
+      )
+  endif()
+endif()
\ No newline at end of file