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

[SYCL] Fix linking with renamed OpenCL library. #37

Merged
merged 1 commit into from
Feb 27, 2019
+1 −9
Merged

[SYCL] Fix linking with renamed OpenCL library. #37

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
3 changes: 1 addition & 2 deletions sycl/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ set ( LLVM_INST_INC_DIRECTORY "lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/i
find_package(OpenCL REQUIRED)

include_directories(${OpenCL_INCLUDE_DIRS})
link_libraries(OpenCL)
link_libraries(${OpenCL_LIBRARY})

# Configure SYCL version macro
set(sycl_inc_dir ${CMAKE_CURRENT_SOURCE_DIR}/include/CL)
@@ -103,7 +103,6 @@ add_library("${SYCLLibrary}" SHARED

include_directories("${SYCLLibrary}" "${includeRootPath}")

target_link_libraries("${SYCLLibrary}" "${OpenCL_LIBRARIES}")
set_target_properties("${SYCLLibrary}" PROPERTIES LINKER_LANGUAGE CXX)

# Workaround for bug in GCC version 5.
7 changes: 0 additions & 7 deletions sycl/tools/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,6 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

find_package(OpenCL REQUIRED)

# All projects need this include directory
include_directories(${OpenCL_INCLUDE_DIRS})

link_libraries(OpenCL)

add_executable(get_device_count_by_type get_device_count_by_type.cpp)

#Minimum supported version of Intel's OCL GPU and CPU devices