P4 to Git Change 1419430 by lmoriche@lmoriche_palamida on 2017/06/07 12:28:09

SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment
	- Enable building the ICD and clinfo.

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#11 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/CMakeLists.txt#2 edit

opencl/CMakeLists.txt

@@ -52,11 +52,11 @@ add_subdirectory(tools/bc2h)
 find_package(ROCR REQUIRED)
 add_subdirectory(runtime)
 
-#set(OPENCL_INCLUDE_DIRS
-#  ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers
-#  ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.0)
+set(OPENCL_INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers
+  ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.0)
 
 add_subdirectory(api/opencl/amdocl)
-#add_subdirectory(api/opencl/khronos/icd)
+add_subdirectory(api/opencl/khronos/icd)
 
-#add_subdirectory(tools/clinfo)
+add_subdirectory(tools/clinfo)

opencl/tools/clinfo/CMakeLists.txt

@@ -6,6 +6,6 @@ include_directories(${OPENCL_INCLUDE_DIRS})
 
 add_definitions(-DHAVE_CL2_HPP)
 
-add_executable(clinfo clinfo.cpp) 
+add_executable(clinfo clinfo.cpp)
 
 target_link_libraries(clinfo OpenCL)