Skip to content

Swift syntaxify round 2 #7509

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 3 commits into from
Closed

Swift syntaxify round 2 #7509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fc925f
Cleanup addition of swift-syntax
bnbarham Apr 25, 2024
41c0836
Things are bad when you're down to message debugging
bnbarham Apr 27, 2024
2a139d4
Move SwiftSyntax find_package to the top level
DougGregor Apr 27, 2024
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.

31 changes: 30 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,38 @@ find_package(dispatch QUIET)
find_package(Foundation QUIET)
find_package(SQLite3 REQUIRED)

include(FetchContent)

set(CMAKE_FIND_DEBUG_MODE TRUE)
message(STATUS "DEBUGNONSENSE find_package(SwiftSyntax)")
find_package(SwiftSyntax CONFIG)
message(STATUS "DEBUGNONSENSE find_package(SwiftSyntax) complete: FOUND is ${SwiftSyntax_FOUND}")
set(CMAKE_FIND_DEBUG_MODE FALSE)

if(NOT SwiftSyntax_FOUND)
message(STATUS "DEBUGNONSENSE In NOT SwiftSyntax_FOUND")
set(SWIFT_SYNTAX_INSTALL_TARGETS YES)
if(DEFINED SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE)
file(TO_CMAKE_PATH "${SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE}" swift_syntax_path)
FetchContent_Declare(SwiftSyntax
SOURCE_DIR "${swift_syntax_path}")
else()
FetchContent_Declare(SwiftSyntax
GIT_REPOSITORY https://github.com/apple/swift-syntax
GIT_TAG main)
endif()
FetchContent_MakeAvailable(SwiftSyntax)
endif()

if (NOT TARGET SwiftSyntax)
message(STATUS "DEBUGNONSENSE missing SwiftSyntax")
endif()
if (NOT TARGET SwiftSyntax::SwiftSyntax)
message(STATUS "DEBUGNONSENSE missing SwiftSyntax::SwiftSyntax")
endif()

# 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)