P4 to Git Change 1977054 by kzhuravl@kzhuravl-spot-ocl on 2019/08/01 12:32:41

SWDEV-79445 - OCL generic changes and code clean-up

	- Fix COMGR+CMAKE combination - http://git.amd.com:8080/c/compute/ec/opencl/+/247843
	- Fix and clean up packaging (cmake) - http://git.amd.com:8080/c/compute/ec/opencl/+/247844

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#26 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#19 edit
... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#16 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#54 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#104 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/CMakeLists.txt#6 edit

rocclr/runtime/device/devprogram.cpp

@@ -1766,7 +1766,7 @@ bool Program::linkImplLC(amd::option::Options* options) {
   }
 
   if (device().settings().lcWavefrontSize64_) {
-    codegenOptions.append(" -mwavefrontsize64");
+    codegenOptions.push_back("-mwavefrontsize64");
   }
 
   // Tokenize the options string into a vector of strings