From 7fa1b2c5b1fa694bdcc5aa9d5c2a8e1a373ea910 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: 6293fd18253e0efd94a58c2d68ce30d9011d4515] --- projects/clr/opencl/CMakeLists.txt | 4 ++-- projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt index 61b0263a5a..0cbc116ba7 100644 --- a/projects/clr/opencl/CMakeLists.txt +++ b/projects/clr/opencl/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/opencl/api/opencl/amdocl/CMakeLists.txt b/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt index 605dd5356f..598650a92d 100644 --- a/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt +++ b/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt @@ -13,7 +13,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/driver/src) include_directories(${CMAKE_SOURCE_DIR}/compiler/lib) include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include) @@ -55,4 +55,4 @@ add_library(amdocl64 SHARED target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCR_LIBRARIES}) -install(TARGETS amdocl64 LIBRARY DESTINATION lib) \ No newline at end of file +install(TARGETS amdocl64 LIBRARY DESTINATION lib)