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

Merge "[CMakeList generator] Add headers to source files"

Browse Source
This commit is contained in:
Fabien Sanglard
2017-03-30 23:41:51 +00:00
committed by Gerrit Code Review
parent a0af35ca21 d9233f1e7c
commit 4a825c7450
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cc/cmakelists.go
View File

@@ -173,8 +173,8 @@ func cleanExecutableName(s string) string {
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) writeAllIncludeDirectories(c.systemHeaderSearchPath, f, true)
writeAllIncludeDirectories(c.headerSearchPath, f) writeAllIncludeDirectories(c.headerSearchPath, f, false)
if cflags { if cflags {
writeAllFlags(c.flags, f, "CMAKE_C_FLAGS") writeAllFlags(c.flags, f, "CMAKE_C_FLAGS")
} }
@@ -195,26 +195,30 @@ func buildCMakePath(p string) string {
return fmt.Sprintf("${ANDROID_ROOT}/%s", p) return fmt.Sprintf("${ANDROID_ROOT}/%s", p)
} }
func writeAllIncludeDirectories(includes []string, f *os.File) { func writeAllIncludeDirectories(includes []string, f *os.File, isSystem bool) {
if len(includes) == 0 { if len(includes) == 0 {
return return
} }
f.WriteString("include_directories(\n")
for _, include := range includes {
f.WriteString(fmt.Sprintf(" \"%s\"\n", buildCMakePath(include)))
}
f.WriteString(")\n")
}
func writeAllSystemDirectories(includes []string, f *os.File) { system := ""
if len(includes) == 0 { if isSystem {
return system = "SYSTEM"
} }
f.WriteString("include_directories(SYSTEM \n")
f.WriteString(fmt.Sprintf("include_directories(%s \n", system))
for _, include := range includes { for _, include := range includes {
f.WriteString(fmt.Sprintf(" \"%s\"\n", buildCMakePath(include))) f.WriteString(fmt.Sprintf(" \"%s\"\n", buildCMakePath(include)))
}
f.WriteString(")\n\n")
// Also add all headers to source files.
f.WriteString("file (GLOB_RECURSE TMP_HEADERS\n");
for _, include := range includes {
f.WriteString(fmt.Sprintf(" \"%s/**/*.h\"\n", buildCMakePath(include)))
} }
f.WriteString(")\n") f.WriteString(")\n")
f.WriteString("list (APPEND SOURCE_FILES ${TMP_HEADERS})\n\n");
} }
func writeAllFlags(flags []string, f *os.File, tag string) { func writeAllFlags(flags []string, f *os.File, tag string) {