Browse Source

Link to Khronos ICD instead of OpenCL

cl-refactor
Lefteris Karapetsas 10 years ago
parent
commit
89dfa35f9e
  1. 2
      exp/CMakeLists.txt
  2. 8
      khronos_icd/CMakeLists.txt
  3. 2
      libethash-cl/CMakeLists.txt

2
exp/CMakeLists.txt

@ -30,6 +30,6 @@ target_link_libraries(${EXECUTABLE} p2p)
if (ETHASHCL)
target_link_libraries(${EXECUTABLE} ethash-cl)
target_link_libraries(${EXECUTABLE} ethash)
target_link_libraries(${EXECUTABLE} ${OpenCL_LIBRARIES})
target_link_libraries(${EXECUTABLE} OpenCL_ICD)
endif()
install( TARGETS ${EXECUTABLE} DESTINATION bin)

8
khronos_icd/CMakeLists.txt

@ -21,14 +21,14 @@ endif ()
# OR copy OpenCL headers to ./inc/CL/
include_directories (./inc)
add_library (OpenCL SHARED ${OPENCL_ICD_LOADER_SOURCES})
set_target_properties (OpenCL PROPERTIES VERSION "1.2" SOVERSION "1")
add_library (OpenCL_ICD SHARED ${OPENCL_ICD_LOADER_SOURCES})
set_target_properties (OpenCL_ICD PROPERTIES VERSION "1.2" SOVERSION "1")
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
set_target_properties (OpenCL PROPERTIES LINK_FLAGS "-Wl,--version-script -Wl,../../khronos_icd/icd_exports.map")
set_target_properties (OpenCL_ICD PROPERTIES LINK_FLAGS "-Wl,--version-script -Wl,../../khronos_icd/icd_exports.map")
endif ()
target_link_libraries (OpenCL ${CMAKE_DL_LIBS})
target_link_libraries (OpenCL_ICD ${CMAKE_DL_LIBS})
enable_testing()
add_subdirectory (test)

2
libethash-cl/CMakeLists.txt

@ -24,7 +24,7 @@ include_directories(${Boost_INCLUDE_DIRS})
include_directories(${OpenCL_INCLUDE_DIRS})
include_directories(..)
add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
TARGET_LINK_LIBRARIES(${EXECUTABLE} ${OpenCL_LIBRARIES} ethash)
TARGET_LINK_LIBRARIES(${EXECUTABLE} OpenCL_ICD ethash)
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

Loading…
Cancel
Save