[CMakeList generator] Add headers to source files
Refactor doesn't work in CLion unless we also add the headers in
the header search path to the list of source file in a project.
Change-Id: Idc6223149ecf7ddf0c21bc0873ad3019ec6ccdd3
diff --git a/cc/cmakelists.go b/cc/cmakelists.go
index 83b6d69..e0192e7 100644
--- a/cc/cmakelists.go
+++ b/cc/cmakelists.go
@@ -173,8 +173,8 @@
func translateToCMake(c compilerParameters, f *os.File, cflags bool, cppflags bool) {
- writeAllSystemDirectories(c.systemHeaderSearchPath, f)
- writeAllIncludeDirectories(c.headerSearchPath, f)
+ writeAllIncludeDirectories(c.systemHeaderSearchPath, f, true)
+ writeAllIncludeDirectories(c.headerSearchPath, f, false)
if cflags {
writeAllFlags(c.flags, f, "CMAKE_C_FLAGS")
}
@@ -195,26 +195,30 @@
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 {
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) {
- if len(includes) == 0 {
- return
+ system := ""
+ if isSystem {
+ system = "SYSTEM"
}
- f.WriteString("include_directories(SYSTEM \n")
+
+ f.WriteString(fmt.Sprintf("include_directories(%s \n", system))
+
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("list (APPEND SOURCE_FILES ${TMP_HEADERS})\n\n");
}
func writeAllFlags(flags []string, f *os.File, tag string) {
