Skip to content

build: repair build on Windows #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 8, 2020
Merged

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Jun 4, 2020

This enables building SourceKit-LSP on Windows. This is sufficient to
repair the build, though it is insufficient to run currently.

@compnerd compnerd requested a review from benlangmuir as a code owner June 4, 2020 16:52
@@ -11,6 +11,10 @@ target_link_libraries(sourcekit-lsp PRIVATE
LanguageServerProtocolJSONRPC
SourceKit
TSCUtility)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(sourcekit-lsp PRIVATE
FoundationXML)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this redundant with the change to Sourcekit/CMakeLists.txt? We only use FoundationXML in that module.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quite possibly! This is an old change that I didn’t update. I’ll adjust and update it :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, okay, this was needed to resolve a path issue when building against the Foundation build tree products as the import FoundationXML causes the client to see the import.

This enables building SourceKit-LSP on Windows.  This is sufficient to
repair the build, though it is insufficient to run currently.
Copy link
Contributor

@benlangmuir benlangmuir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, LGTM except it needs to get rebased - the "SourceKit" target was renamed to "SourceKitLSP".

@compnerd
Copy link
Member Author

compnerd commented Jun 6, 2020

@swift-ci please test

@benlangmuir
Copy link
Contributor

@swift-ci please test

1 similar comment
@benlangmuir
Copy link
Contributor

@swift-ci please test

@compnerd
Copy link
Member Author

compnerd commented Jun 8, 2020

@swift-ci please test macOS platform

@compnerd
Copy link
Member Author

compnerd commented Jun 8, 2020

@swift-ci please test Linux platform

@benlangmuir benlangmuir merged commit 1b5fdce into swiftlang:master Jun 8, 2020
@compnerd compnerd deleted the linking branch June 8, 2020 23:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants