Skip to content

Commit c1a6e65

Browse files
add CMake build to DocCDocumentation module
1 parent 49b3f53 commit c1a6e65

File tree

6 files changed

+26
-5
lines changed

6 files changed

+26
-5
lines changed

Package.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,8 @@ var targets: [Target] = [
223223
"BuildSystemIntegration",
224224
"LanguageServerProtocol",
225225
"SemanticIndex",
226-
"SKLogging",
227-
"SKUtilities",
228226
"SwiftExtensions",
227+
.product(name: "IndexStoreDB", package: "indexstore-db"),
229228
.product(name: "SwiftDocC", package: "swift-docc"),
230229
],
231230
exclude: ["CMakeLists.txt"],

Sources/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ add_subdirectory(CCompletionScoring)
88
add_subdirectory(CompletionScoring)
99
add_subdirectory(Csourcekitd)
1010
add_subdirectory(Diagnose)
11+
add_subdirectory(DocCDocumentation)
1112
add_subdirectory(InProcessClient)
1213
add_subdirectory(LanguageServerProtocol)
1314
add_subdirectory(LanguageServerProtocolExtensions)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
add_library(DocCDocumentation STATIC
3+
BuildSystemIntegrationExtensions.swift
4+
DocCCatalogIndexManager.swift
5+
DocCDocumentationManager.swift
6+
DocCReferenceResolutionService.swift
7+
DocCSymbolLink.swift
8+
DoccDocumentationError.swift
9+
DocCDocumentationManagerImpl.swift
10+
DocCServer.swift
11+
)
12+
set_target_properties(DocCDocumentation PROPERTIES
13+
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
14+
target_link_libraries(DocCDocumentation PUBLIC
15+
BuildServerProtocol
16+
BuildSystemIntegration
17+
IndexStoreDB
18+
LanguageServerProtocol
19+
SemanticIndex
20+
SwiftExtensions)

Sources/DocCDocumentation/DocCCatalogIndexManager.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package protocol DocCCatalogIndex: Sendable {
1818

1919
#if canImport(SwiftDocC)
2020
@preconcurrency import SwiftDocC
21-
import SwiftExtensions
2221

2322
final actor DocCCatalogIndexManager {
2423
private let server: DocCServer

Sources/DocCDocumentation/DocCDocumentationManagerImpl.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ package import IndexStoreDB
66
package import LanguageServerProtocol
77
package import SemanticIndex
88
import SwiftDocC
9-
import SwiftExtensions
10-
import SwiftSyntax
119

1210
package final actor DocCDocumentationManagerImpl: DocCDocumentationManagerWithRendering {
1311
private let doccServer: DocCServer

Sources/SourceKitLSP/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ target_sources(SourceKitLSP PRIVATE
2626
Clang/SemanticTokenTranslator.swift
2727
)
2828
target_sources(SourceKitLSP PRIVATE
29+
Documentation/DocCDocumentationHandler.swift
2930
Documentation/DocumentationLanguageService.swift
3031
)
3132
target_sources(SourceKitLSP PRIVATE
@@ -45,6 +46,7 @@ target_sources(SourceKitLSP PRIVATE
4546
Swift/CursorInfo.swift
4647
Swift/Diagnostic.swift
4748
Swift/DiagnosticReportManager.swift
49+
Swift/DocCDocumentation.swift
4850
Swift/DocumentFormatting.swift
4951
Swift/DocumentSymbols.swift
5052
Swift/ExpandMacroCommand.swift
@@ -100,7 +102,9 @@ target_link_libraries(SourceKitLSP PUBLIC
100102
SwiftSyntax::SwiftRefactor
101103
SwiftSyntax::SwiftSyntax)
102104
target_link_libraries(SourceKitLSP PRIVATE
105+
Markdown
103106
PackageModelSyntax
104107
TSCExtensions
108+
SymbolGraph
105109
$<$<NOT:$<PLATFORM_ID:Darwin>>:FoundationXML>)
106110

0 commit comments

Comments
 (0)