averello/sourcekit-lsp
1
0
Fork 0
mirror of https://github.com/apple/sourcekit-lsp.git synced 2026-03-02 18:23:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #352 from compnerd/gnu-dependency

Browse Source 
SKSwiftPMWorkspace: make `testBasicCXXArgs` pass on Windows
This commit is contained in:
Ben Langmuir
2020-11-30 13:17:37 -08:00
committed by GitHub
parent 18d0022e66 5247a6e540
commit 91f1b1e9e8
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
View File

@@ -378,7 +378,11 @@ extension SwiftPMWorkspace {
var args = td.basicArguments()
let compilePath = td.compilePaths().first(where: { $0.source == path })
let nativePath: AbsolutePath =
URL(fileURLWithPath: path.pathString).withUnsafeFileSystemRepresentation {
AbsolutePath(String(cString: $0!))
}
let compilePath = td.compilePaths().first(where: { $0.source == nativePath })
if let compilePath = compilePath {
args += [
"-MD",

23
Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
View File

@@ -365,16 +365,27 @@ final class SwiftPMWorkspaceTests: XCTestCase {
let args = ws.settings(for: acxx.asURI, .cpp)!.compilerArguments
checkArgsCommon(args)
check("-MD", "-MT", "dependencies",
"-MF", build.appending(components: "lib.build", "a.cpp.d").pathString,
arguments: args)
check("-c", acxx.pathString, arguments: args)
check("-o", build.appending(components: "lib.build", "a.cpp.o").pathString, arguments: args)
URL(fileURLWithPath: build.appending(components: "lib.build", "a.cpp.d").pathString)
.withUnsafeFileSystemRepresentation {
check("-MD", "-MT", "dependencies", "-MF", String(cString: $0!), arguments: args)
}
URL(fileURLWithPath: acxx.pathString).withUnsafeFileSystemRepresentation {
check("-c", String(cString: $0!), arguments: args)
}
URL(fileURLWithPath: build.appending(components: "lib.build", "a.cpp.o").pathString)
.withUnsafeFileSystemRepresentation {
check("-o", String(cString: $0!), arguments: args)
}
let header = packageRoot.appending(components: "Sources", "lib", "include", "a.h")
let headerArgs = ws.settings(for: header.asURI, .cpp)!.compilerArguments
checkArgsCommon(headerArgs)
check("-c", "-x", "c++-header", header.pathString, arguments: headerArgs)
check("-c", "-x", "c++-header", URL(fileURLWithPath: header.pathString).path,
arguments: headerArgs)
}
}