Skip to content

[Build] Fix up the cmake build after swift-syntax was added #7502

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

[Build] Fix up the cmake build after swift-syntax was added #7502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions BuildSupport/SwiftSyntax/CMakeLists.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ if(FIND_PM_DEPS)
find_package(SwiftASN1 CONFIG REQUIRED)
find_package(SwiftCertificates CONFIG REQUIRED)
find_package(SwiftCrypto CONFIG REQUIRED)
find_package(SwiftSyntax CONFIG REQUIRED)
endif()

find_package(dispatch QUIET)
Expand All @@ -54,6 +55,5 @@ find_package(SQLite3 REQUIRED)
# Enable `package` modifier for the whole package.
add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>")

add_subdirectory(BuildSupport/SwiftSyntax)
add_subdirectory(Sources)
add_subdirectory(cmake/modules)
26 changes: 6 additions & 20 deletions Sources/PackageModelSyntax/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ target_link_libraries(PackageModelSyntax PUBLIC
PackageLoading
PackageModel

SwiftBasicFormat
SwiftDiagnostics
SwiftIDEUtils
SwiftParser
SwiftSyntax
SwiftSyntaxBuilder
SwiftSyntax::SwiftBasicFormat
SwiftSyntax::SwiftDiagnostics
SwiftSyntax::SwiftIDEUtils
SwiftSyntax::SwiftParser
SwiftSyntax::SwiftSyntax
SwiftSyntax::SwiftSyntaxBuilder
)

# NOTE(compnerd) workaround for CMake not setting up include flags yet
Expand All @@ -41,17 +41,3 @@ install(TARGETS PackageModelSyntax
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin)
set_property(GLOBAL APPEND PROPERTY SwiftPM_EXPORTS PackageModelSyntax)

set(SWIFT_SYNTAX_MODULES
SwiftBasicFormat
SwiftParser
SwiftParserDiagnostics
SwiftDiagnostics
SwiftSyntax
SwiftSyntaxBuilder
SwiftIDEUtils
)
export(TARGETS ${SWIFT_SYNTAX_MODULES}
NAMESPACE SPMSwiftSyntax::
FILE ${CMAKE_BINARY_DIR}/cmake/modules/SwiftSyntaxConfig.cmake
EXPORT_LINK_INTERFACE_LIBRARIES)