From fa72a9a820ddaefe227c326cd81e5c0446ea4639 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 1 Nov 2017 13:01:29 -0400 Subject: [PATCH] P4 to Git Change 1477431 by kzhuravl@kzhuravl-fiji-ocllc on 2017/11/01 12:56:46 SWDEV-102733 - Update cmake for CL 1455364 Testing: open source build, also here http://git.amd.com:8080/#/c/113674/ Affected files ... ... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#18 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#12 edit ... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#7 edit [ROCm/clr commit: 6afeb11d56417d59741caca18e83e96e75510f05] --- projects/clr/rocclr/CMakeLists.txt | 4 ++-- projects/clr/rocclr/runtime/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/clr/rocclr/CMakeLists.txt b/projects/clr/rocclr/CMakeLists.txt index 61b0263a5a..0cbc116ba7 100644 --- a/projects/clr/rocclr/CMakeLists.txt +++ b/projects/clr/rocclr/CMakeLists.txt @@ -53,7 +53,7 @@ add_subdirectory(runtime) set(OPENCL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers - ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.0) + ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2) add_subdirectory(api/opencl/amdocl) add_subdirectory(api/opencl/khronos/icd) @@ -64,7 +64,7 @@ install(PROGRAMS $ DESTINATION lib) install(DIRECTORY - "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.0" + "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2" DESTINATION include USE_SOURCE_PERMISSIONS PATTERN cl_egl.h EXCLUDE) diff --git a/projects/clr/rocclr/runtime/CMakeLists.txt b/projects/clr/rocclr/runtime/CMakeLists.txt index 1fe750b66a..4e1c2aa4da 100644 --- a/projects/clr/rocclr/runtime/CMakeLists.txt +++ b/projects/clr/rocclr/runtime/CMakeLists.txt @@ -19,7 +19,7 @@ include_directories(${CMAKE_SOURCE_DIR}/runtime) include_directories(${CMAKE_SOURCE_DIR}/api/opencl) include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos) include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers) -include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.0) +include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2) include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/include) include_directories(${CMAKE_SOURCE_DIR}/compiler/driver/src) include_directories(${CMAKE_SOURCE_DIR}/compiler/lib)