Merge pull request #655 from aciidb0mb3r/include-dir-xcodeproj

[Xcodeproj] Add include group for C lang targets

Author: aciidgh

Sources/Xcodeproj/pbxproj().swift

@@ -349,6 +349,17 @@ func xcodeProject(
             // Also add the source file to the compile phase.
             compilePhase.addBuildFile(fileRef: srcFileRef)
         }
+
+        // Add the `include` group for a libary C language target.
+        if case let clangModule as ClangModule = module, clangModule.type == .library, fileSystem.isDirectory(clangModule.includeDir) {
+            let includeDir = clangModule.includeDir
+            _ = makeGroup(for: includeDir)
+            // FIXME: Support C++ headers.
+            for header in try walk(includeDir, fileSystem: fileSystem) where header.extension == "h" {
+                let group = makeGroup(for: header.parentDirectory)
+                group.addFileReference(path: header.basename)
+            }
+        }
     }
 
     // Go through all the module/target pairs again, and add target dependencies

Tests/XcodeprojTests/PackageGraphTests.swift

@@ -44,8 +44,10 @@ class PackageGraphTests: XCTestCase {
                 "Package.swift",
                 "Sources/Foo/foo.swift",
                 "Sources/Sea2/Sea2.c",
+                "Sources/Sea2/include/Sea2.h",
                 "Sources/Bar/bar.swift",
                 "Sources/Sea/Sea.c",
+                "Sources/Sea/include/Sea.h",
                 "Tests/BarTests/barTests.swift",
                 "Products/Foo.framework",
                 "Products/Sea2.framework",