P4 to Git Change 1444178 by lmoriche@lmoriche_opencl_dev2 on 2017/08/07 14:50:37

SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment
	- Use the internal libelf instead of the system's when building with cmake.
	- Don't include codecvt if WITH_LIQUID_FLASH is not defined
	- Don't memset the device::Kernel::workGroupInfo_, there's a std::string in it. The constructor already zeroes all the fields.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#8 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#25 edit

opencl/api/opencl/amdocl/CMakeLists.txt

@@ -15,6 +15,8 @@ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib)
 include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
 include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
 include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders)
+include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf)
+include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common)
 include_directories(${CMAKE_SOURCE_DIR}/compiler/tools)
  
 add_library(amdocl64 SHARED

opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp

@@ -5,8 +5,6 @@
 #include "cl_common.hpp"
 #include <CL/cl_ext.h>
 
-#include <locale>
-#include <codecvt>
 #include "platform/object.hpp"
 
 #include "cl_lqdflash_amd.h"
@@ -18,6 +16,8 @@
 
 #if defined(WITH_LIQUID_FLASH)
 #include "lf.h"
+#include <locale>
+#include <codecvt>
 #endif  // WITH_LIQUID_FLASH
 
 namespace amd {