Attachment #719490 for bug #789717

Lines 19-28 if(CMAKE_BUILD_TYPE MATCHES "^Debug$") Link Here

(-)ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/CMakeLists.txt (-4 / +4 lines)
19	add_definitions(-DDEBUG)	19	add_definitions(-DDEBUG)
20	endif()	20	endif()
21		21
22	include_directories(${CMAKE_CURRENT_LIST_DIR}/..)	22	include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/..)
23	include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos)	23	include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos)
24	include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers)	24	include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos/headers)
25	include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2)	25	include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2)
26	include_directories(/usr/include/rocclr)	26	include_directories(/usr/include/rocclr)
27	include_directories(/usr/include/rocclr/compiler/lib/include/)	27	include_directories(/usr/include/rocclr/compiler/lib/include/)
28	include_directories(/usr/include/rocclr/elf/)	28	include_directories(/usr/include/rocclr/elf/)

Lines 121-130 else() Link Here

(-)ROCm-OpenCL-Runtime-rocm-4.1.0.orig/khronos/icd/CMakeLists.txt (-2 / +2 lines)
121	endif ()	121	endif ()
122	endif ()	122	endif ()
123		123
124	include_directories (${OPENCL_ICD_LOADER_HEADERS_DIR})	124	include_directories (SYSTEM ${OPENCL_ICD_LOADER_HEADERS_DIR})
125	add_definitions (-DCL_TARGET_OPENCL_VERSION=220)	125	add_definitions (-DCL_TARGET_OPENCL_VERSION=220)
126		126
127	target_include_directories (OpenCL PRIVATE ${CMAKE_CURRENT_BINARY_DIR} loader)	127	target_include_directories (OpenCL SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR} loader)
128	target_link_libraries (OpenCL ${CMAKE_DL_LIBS})	128	target_link_libraries (OpenCL ${CMAKE_DL_LIBS})
129		129
130	include (CTest)	130	include (CTest)

Lines 21-26 Link Here

(-)ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/cl_common.hpp (+1 lines)
21	#ifndef CL_COMMON_HPP_	21	#ifndef CL_COMMON_HPP_
22	#define CL_COMMON_HPP_	22	#define CL_COMMON_HPP_
23		23
		24	#include <CL/cl_gl_ext.h>
24	#ifdef _WIN32	25	#ifdef _WIN32
25	#include <CL/cl_d3d11.h>	26	#include <CL/cl_d3d11.h>
26	#include <CL/cl_d3d10.h>	27	#include <CL/cl_d3d10.h>

Return to bug 789717