From f58d57b68083343ff341e464696c74f6fdc2931a Mon Sep 17 00:00:00 2001 From: Doug Gregor Date: Thu, 25 Apr 2024 09:29:45 -0700 Subject: [PATCH 1/2] Use SwiftSyntax:: prefix for SwiftSyntax We actually want it to be the same as other clients that might use both SwiftSyntax and SwiftPM, such as SourceKit-LSP. --- Sources/PackageModelSyntax/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/PackageModelSyntax/CMakeLists.txt b/Sources/PackageModelSyntax/CMakeLists.txt index 556fd0c619b..b2efe417234 100644 --- a/Sources/PackageModelSyntax/CMakeLists.txt +++ b/Sources/PackageModelSyntax/CMakeLists.txt @@ -52,6 +52,6 @@ set(SWIFT_SYNTAX_MODULES SwiftIDEUtils ) export(TARGETS ${SWIFT_SYNTAX_MODULES} - NAMESPACE SPMSwiftSyntax:: + NAMESPACE SwiftSyntax:: FILE ${CMAKE_BINARY_DIR}/cmake/modules/SwiftSyntaxConfig.cmake - EXPORT_LINK_INTERFACE_LIBRARIES) \ No newline at end of file + EXPORT_LINK_INTERFACE_LIBRARIES) From 0aa415bd5b5ed1de93a8376e37e0c9ea27dcf9de Mon Sep 17 00:00:00 2001 From: Doug Gregor Date: Thu, 25 Apr 2024 12:13:31 -0700 Subject: [PATCH 2/2] Allow us to build shared libraries for SwiftSyntax --- BuildSupport/SwiftSyntax/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/BuildSupport/SwiftSyntax/CMakeLists.txt b/BuildSupport/SwiftSyntax/CMakeLists.txt index 09f4cd51d2c..f79ae79607c 100644 --- a/BuildSupport/SwiftSyntax/CMakeLists.txt +++ b/BuildSupport/SwiftSyntax/CMakeLists.txt @@ -1,7 +1,5 @@ include(FetchContent) -set(BUILD_SHARED_LIBS OFF) - if(DEFINED SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE) file(TO_CMAKE_PATH "${SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE}" swift_syntax_path) FetchContent_Declare(SwiftSyntax