Skip to content

Remove unncessary X11 linage in OpenCL examples #221

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
9prady9 merged 2 commits into from
Jan 26, 2021
Merged

Remove unncessary X11 linage in OpenCL examples #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06365d9
Fix OpenCL examples warnings for newer OpenCL headers
9prady9 Jan 26, 2021
a27c74f
Remove unncessary X11 linage in OpenCL examples
9prady9 Jan 26, 2021
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
14 changes: 1 addition & 13 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,6 @@ mark_as_advanced(
CUDA_rt_LIBRARY
CMAKE_CUDA_HOST_COMPILER)

if(APPLE)
find_package(X11 REQUIRED)
if(X11_FOUND AND NOT TARGET X11::x11)
add_library(X11::x11 UNKNOWN IMPORTED)
set_target_properties(X11::x11 PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGE "C"
IMPORTED_LOCATION "${X11_X11_LIB}"
INTEFACE_INCLUDE_DIRECTORIES "${X11_INCLUDE_DIR}")
endif()
endif()

include(CMakeParseArguments)
include(CMakeDependentOption)
include(InternalUtils)
Expand Down Expand Up @@ -100,8 +89,7 @@ function(add_example target_name source backend)
target_link_libraries(${target}
OSCompileFlags
Forge::forge
${arg_LIBRARIES}
$<$<PLATFORM_ID:Darwin>:X11::x11>)
${arg_LIBRARIES})
endfunction()

add_subdirectory(cpu)
Expand Down
1 change: 1 addition & 0 deletions examples/opencl/cl_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#define CL_HPP_ENABLE_EXCEPTIONS
#define CL_HPP_MINIMUM_OPENCL_VERSION 120
#define CL_HPP_TARGET_OPENCL_VERSION 120
#define CL_TARGET_OPENCL_VERSION 120

#if defined(__GNUC__)
#pragma GCC diagnostic push
Expand Down