[SYCL] The build system doesn't use the OpenCL_LIBRARY passed in everywhere

[kpet]

There are a number of places where the build system uses a hard-coded reference to OpenCL instead of using the passed in OpenCL_LIBRARY. This prevents the build from succeeding in environments where the OpenCL implementation doesn't reside in a library called OpenCL. The following patch seems to have done the trick for me:

--- a/sycl/CMakeLists.txt
+++ b/sycl/CMakeLists.txt
@@ -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})

 # Copy SYCL headers
 set(sycl_inc_dir ${CMAKE_CURRENT_SOURCE_DIR}/include/CL)
@@ -96,7 +96,7 @@ add_library("${SYCLLibrary}" SHARED

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

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

 # Workaround for bug in GCC version 5.
@@ -7,7 +7,7 @@ find_package(OpenCL REQUIRED)
 # All projects need this include directory
 include_directories(${OpenCL_INCLUDE_DIRS})

-link_libraries(OpenCL)
+link_libraries(${OpenCL_LIBRARY})

 add_executable(get_device_count_by_type get_device_count_by_type.cpp)

[bader]

How about this version:

 git diff
diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
index 35879344cbd..cc1ec2da96a 100644
--- a/sycl/CMakeLists.txt
+++ b/sycl/CMakeLists.txt
@@ -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.
diff --git a/sycl/tools/CMakeLists.txt b/sycl/tools/CMakeLists.txt
index 7ef7457fa17..bb524298a4c 100644
--- a/sycl/tools/CMakeLists.txt
+++ b/sycl/tools/CMakeLists.txt
@@ -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

target_link_libraries we can definitely remove as we used link_libraries in the same cmake file.
As tools/CMakeLists.txt doesn't configure a new project, parent cmake configuration is applied, so there is no need to duplicate OpenCL configuration. The only downside is that this change adds an assumption that OpenCL paths are "pre-configured" somewhere outside of tools/CMakeLists.txt.

[bader]

I hope #37 fixed that problem.
Can we close this?

[kpet]

@bader Sorry for the delay and thanks for addressing this. Looking at #37 it should do it but I won't have time to retest before a while. I'll reopen this if I'm still facing issues. Thanks again!

[bader]

No problem. Thanks for reporting this problem.