Do not export swift-syntax

Author: bnbarham

BuildSupport/SwiftSyntax/CMakeLists.txt

@@ -12,3 +12,14 @@ else()
     GIT_TAG main)
 endif()
 FetchContent_MakeAvailable(SwiftSyntax)
+
+# TODO: We should define these in swift-syntax itself and then use the
+#       namespaced in all dependents (right now we go the other way around).
+if(NOT TARGET SwiftSyntax)
+  add_library(SwiftBasicFormat ALIAS SwiftSyntax::SwiftBasicFormat)
+  add_library(SwiftDiagnostics ALIAS SwiftSyntax::SwiftDiagnostics)
+  add_library(SwiftIDEUtils ALIAS SwiftSyntax::SwiftIDEUTils)
+  add_library(SwiftParser ALIAS SwiftSyntax::SwiftParser)
+  add_library(SwiftSyntax ALIAS SwiftSyntax::SwiftSyntax)
+  add_library(SwiftSyntaxBuilder ALIAS SwiftSyntax::SwiftSyntaxBuilder)
+endif()

Sources/PackageModelSyntax/CMakeLists.txt

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