Skip to content

GPU CMake: Respect OpenCL_ROOT from opencl alidist package if used #15930

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

Merged
davidrohr merged 1 commit into from
Oct 11, 2026
Merged

GPU CMake: Respect OpenCL_ROOT from opencl alidist package if used #15930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion GPU/GPUTracking/Base/opencl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@ endif()

if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
add_library(${MODULE} SHARED ${SRCS})
target_link_libraries(${MODULE} GPUTracking OpenCL)
if(TARGET OpenCL::OpenCL)
target_link_libraries(${MODULE} GPUTracking OpenCL::OpenCL)
else()
target_link_libraries(${MODULE} GPUTracking OpenCL)
endif()
install(TARGETS ${MODULE})
set(targetName ${MODULE})
endif()
Expand Down
14 changes: 12 additions & 2 deletions dependencies/FindO2GPU.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# or submit itself to any jurisdiction.

# NOTE!!!! - Whenever this file is changed, move it over to alidist/resources
# FindO2GPU.cmake Version 21
# FindO2GPU.cmake Version 22

set(CUDA_COMPUTETARGET_DEFAULT_FULL 80-real;86-real;89-real;120-real;75-virtual)
set(HIP_AMDGPUTARGET_DEFAULT_FULL gfx906;gfx908)
Expand Down Expand Up @@ -281,6 +281,15 @@ endif()

# ================================== OpenCL ==================================
if(ENABLE_OPENCL)
if(NOT OpenCL_ROOT AND DEFINED ENV{OpenCL_ROOT})
set(OpenCL_ROOT "$ENV{OpenCL_ROOT}")
endif()
if(OpenCL_ROOT)
unset(OpenCL_INCLUDE_DIR CACHE)
unset(OpenCL_LIBRARY CACHE)
find_path(OpenCL_INCLUDE_DIR NAMES CL/cl.h PATHS "${OpenCL_ROOT}" PATH_SUFFIXES include NO_DEFAULT_PATH)
find_library(OpenCL_LIBRARY NAMES OpenCL PATHS "${OpenCL_ROOT}" PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
endif()
find_package(OpenCL)
if(ENABLE_OPENCL AND NOT ENABLE_OPENCL STREQUAL "AUTO")
set_package_properties(OpenCL PROPERTIES TYPE REQUIRED)
Expand Down Expand Up @@ -317,7 +326,8 @@ if(ENABLE_OPENCL)
(OpenCL_VERSION_STRING VERSION_GREATER_EQUAL 2.2
OR OPENCL_ENABLED_SPIRV))
set(OPENCL_ENABLED ON)
message(STATUS "Found OpenCL ${OpenCL_VERSION_STRING} (SPIR-V ${OPENCL_ENABLED_SPIRV} ${LLVM_CLANG} ${LLVM_PACKAGE_VERSION} ${LLVM_SPIRV})")
get_filename_component(OpenCL_LIBRARY_DIR "${OpenCL_LIBRARY}" DIRECTORY)
message(STATUS "Found OpenCL ${OpenCL_VERSION_STRING} (Headers ${OpenCL_INCLUDE_DIR}, Library ${OpenCL_LIBRARY_DIR}, SPIR-V ${OPENCL_ENABLED_SPIRV} ${LLVM_CLANG} ${LLVM_PACKAGE_VERSION} ${LLVM_SPIRV})")
elseif(NOT ENABLE_OPENCL STREQUAL "AUTO")
message(FATAL_ERROR "OpenCL >= 2.x not available")
else()
Expand Down
Loading