Add OpenCL include directories to ICD

- Also make it PUBLIC in cmake so that all who link to it will also get
  the OpenCL headers

ethminer/CMakeLists.txt

@@ -9,9 +9,6 @@ if (JSONRPC)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
 endif()
-if (ETHASHCL)
-	include_directories(${OpenCL_INCLUDE_DIRS})
-endif ()
 
 set(EXECUTABLE ethminer)
 

exp/CMakeLists.txt

@@ -6,9 +6,6 @@ aux_source_directory(. SRC_LIST)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 include_directories(BEFORE ..)
 include_directories(${DB_INCLUDE_DIRS})
-if (ETHASHCL)
-	include_directories(${OpenCL_INCLUDE_DIRS})
-endif ()
 
 set(EXECUTABLE exp)
 

khronos_icd/CMakeLists.txt

@@ -29,6 +29,7 @@ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 endif ()
 
 target_link_libraries (OpenCL_ICD ${CMAKE_DL_LIBS})
+target_include_directories(OpenCL_ICD PUBLIC ${OpenCL_INCLUDE_DIR})
 
 enable_testing()
 add_subdirectory (test)

khronos_icd/test/platform/CMakeLists.txt

@@ -1 +1,2 @@
 add_library (IcdLog SHARED icd_test_log.c)
+target_include_directories(IcdLog PUBLIC ${OpenCL_INCLUDE_DIR})

libethash-cl/CMakeLists.txt

@@ -21,7 +21,6 @@ set(HEADERS ${OUR_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/ethash_cl_miner_kernel.h)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${OpenCL_INCLUDE_DIRS})
 include_directories(..)
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 TARGET_LINK_LIBRARIES(${EXECUTABLE} OpenCL_ICD ethash)

libethcore/CMakeLists.txt

@@ -12,10 +12,6 @@ aux_source_directory(. SRC_LIST)
 include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
 
-if (ETHASHCL)
-	include_directories(${OpenCL_INCLUDE_DIRS})
-endif ()
-
 if (CPUID_FOUND)
 	include_directories(${Cpuid_INCLUDE_DIRS})
 endif ()