Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

intel-compute-runtime: Fix to use OCL_ICD_VENDORDIR cmake variable #6253

Merged
merged 2 commits into from
Oct 5, 2024
Merged

intel-compute-runtime: Fix to use OCL_ICD_VENDORDIR cmake variable #6253

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed78ce0
intel-compute-runtime: Fix to use OCL_ICD_VENDORDIR cmake variable
th0ma7 Oct 5, 2024
b74044b
intel-compute-runtime: No need for using DESTDIR with intel.icd fix
th0ma7 Oct 5, 2024
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
8 changes: 1 addition & 7 deletions cross/intel-compute-runtime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ COMMENT = The Intel(R) Graphics Compute Runtime for oneAPI Level Zero and OpenCL
LICENSE = MIT license

POST_EXTRACT_TARGET = intel-compute-runtime_post_extract_target
POST_INSTALL_TARGET = intel-compute-runtime_post_install_target
CMAKE_USE_NINJA = 0
CMAKE_USE_DESTDIR = 1

DEPENDS = cross/intel-gmmlib
DEPENDS += cross/intel-graphics-compiler
Expand All @@ -31,6 +29,7 @@ BUILD_DEPENDS += cross/Khronos-SPIRV-Headers
CMAKE_ARGS += -DIGC_DIR=$(STAGING_INSTALL_PREFIX)
CMAKE_ARGS += -DNEO_DISABLE_LD_GOLD:BOOL='ON'
CMAKE_ARGS += -DSKIP_UNIT_TESTS=1
CMAKE_ARGS += -DOCL_ICD_VENDORDIR=$(INSTALL_PREFIX)/etc/OpenCL/vendors/

include ../../mk/spksrc.cross-cmake.mk

Expand All @@ -39,8 +38,3 @@ ENV += LD_LIBRARY_PATH=$(STAGING_INSTALL_PREFIX)/lib
.PHONY: intel-compute-runtime_post_extract_target
intel-compute-runtime_post_extract_target:
@cd $(WORK_DIR) && ln -s $(PKG_DIR) $(PKG_NAME)

.PHONY: intel-compute-runtime_post_install_target
intel-compute-runtime_post_install_target:
@install -m 755 -d $(STAGING_INSTALL_PREFIX)/etc/OpenCL/vendors/
@install -m 644 $(INSTALL_DIR)/etc/OpenCL/vendors/intel.icd $(STAGING_INSTALL_PREFIX)/etc/OpenCL/vendors/