CMake: Don't build _CSwiftSyntax module

rintaro · rintaro · commit 2a4da18af371 · 2022-08-30T09:44:42.000-07:00
`SwiftSyntax` module now doesn't have the dependency to `_CSwiftSyntax`
anymore. It's not needed for CMake builds.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,9 +13,6 @@ project(SwiftSyntax LANGUAGES C Swift)
 set(SWIFT_VERSION 5)
 set(CMAKE_Swift_LANGUAGE_VERSION ${SWIFT_VERSION})
 
-# ensure Swift compiler can find _CSwiftSyntax
-add_compile_options($<$<COMPILE_LANGUAGE:Swift>:-I$<SEMICOLON>${CMAKE_CURRENT_SOURCE_DIR}/Sources/_CSwiftSyntax/include>)
-
 set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
@@ -6,7 +6,6 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_subdirectory(_CSwiftSyntax)
 add_subdirectory(SwiftSyntax)
 add_subdirectory(SwiftDiagnostics)
 add_subdirectory(SwiftParser)
diff --git a/Sources/SwiftSyntax/CMakeLists.txt b/Sources/SwiftSyntax/CMakeLists.txt
@@ -56,9 +56,6 @@ add_library(SwiftSyntax STATIC
   gyb_generated/syntax_nodes/SyntaxTypeNodes.swift
 )
 
-target_link_libraries(SwiftSyntax PRIVATE
-  _CSwiftSyntax)
-
 set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftSyntax)
 
 # NOTE: workaround for CMake not setting up include flags yet
diff --git a/Sources/_CSwiftSyntax/CMakeLists.txt b/Sources/_CSwiftSyntax/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,6 @@ add_library(SwiftSyntax STATIC`
`56`	`56`	`gyb_generated/syntax_nodes/SyntaxTypeNodes.swift`
`57`	`57`	`)`
`58`	`58`
`59`		`-target_link_libraries(SwiftSyntax PRIVATE`
`60`		`- _CSwiftSyntax)`
`61`		`-`
`62`	`59`	`set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftSyntax)`
`63`	`60`
`64`	`61`	`# NOTE: workaround for CMake not setting up include flags yet`