openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[CMakeList generator] Fix executable name 

Treble genererated project name feature character no accepted by
CMake. So far only @ is a problem.

Change-Id: Iac460033f1181f46ab8205e5706271f99ab798d3
This commit is contained in:
Fabien Sanglard 2017-03-23 17:49:09 -07:00
parent e7ee3c7bc2
commit 7da4926263
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cc/cmakelists.go
View File

@ -163,9 +163,15 @@ func generateCLionProject(compiledModule CompiledInterface, ctx blueprint.Single
translateToCMake(cppParameters, f, false, true)
// Add project executable.
f.WriteString(fmt.Sprintf("\nadd_executable(%s ${SOURCE_FILES})\n", ccModule.ModuleBase.Name()))
f.WriteString(fmt.Sprintf("\nadd_executable(%s ${SOURCE_FILES})\n",
cleanExecutableName(ccModule.ModuleBase.Name())))
}
func cleanExecutableName(s string) string {
return strings.Replace(s, "@", "-", -1)
}
func translateToCMake(c compilerParameters, f *os.File, cflags bool, cppflags bool) {
writeAllSystemDirectories(c.systemHeaderSearchPath, f)
writeAllIncludeDirectories(c.headerSearchPath, f)