StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[CMakeList generator] Fix executable name"

Browse Source
This commit is contained in:
Fabien Sanglard
2017-03-28 00:30:17 +00:00
committed by Gerrit Code Review
parent 43a485cfb1 7da4926263
commit 27b812d0d2
1 changed files with 7 additions and 1 deletions
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) translateToCMake(cppParameters, f, false, true)
// Add project executable. // 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) { func translateToCMake(c compilerParameters, f *os.File, cflags bool, cppflags bool) {
writeAllSystemDirectories(c.systemHeaderSearchPath, f) writeAllSystemDirectories(c.systemHeaderSearchPath, f)
writeAllIncludeDirectories(c.headerSearchPath, f) writeAllIncludeDirectories(c.headerSearchPath, f)