Update FoundationMacros cmake build to link against the right SwiftSyntax

Author: jmschonfeld

Sources/CMakeLists.txt

@@ -13,5 +13,6 @@
 ##===----------------------------------------------------------------------===##
 
 add_subdirectory(_CShims)
+add_subdirectory(FoundationMacros)
 add_subdirectory(FoundationEssentials)
 add_subdirectory(FoundationInternationalization)

Sources/FoundationEssentials/CMakeLists.txt

@@ -15,13 +15,17 @@
 file(GLOB_RECURSE _FoundationEssentialsSources "*.swift")
 add_library(FoundationEssentials SHARED ${_FoundationEssentialsSources})
 
-# Configure FoundationMacros
-include(ExternalProject)
-ExternalProject_Add(FoundationMacros
-    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../FoundationMacros"
-    INSTALL_COMMAND "")
+# Depend on FoundationMacros
 add_dependencies(FoundationEssentials FoundationMacros)
 
+if(FOUNDATION_MACROS_BUILD_AS_EXECUTABLE)
+    if(CMAKE_HOST_WIN32)
+        set(FoundationMacrosPath "${CMAKE_BINARY_DIR}/FoundationMacros.exe#FoundationMacros")
+    else()
+        set(FoundationMacrosPath "${CMAKE_BINARY_DIR}/FoundationMacros#FoundationMacros")
+    endif()
+    target_compile_options(FoundationEssentials PRIVATE -load-plugin-executable "${FoundationMacrosPath}")
+endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL Android)
     target_compile_options(FoundationEssentials PRIVATE

Sources/FoundationMacros/CMakeLists.txt

@@ -31,34 +31,37 @@ set(FOUNDATION_MACROS_HOST_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/swift/host")
 set(FOUNDATION_MACROS_PLUGINS_DIR "${FOUNDATION_MACROS_HOST_DIR}/plugins")
 
 file(GLOB_RECURSE _FoundationMacrosSources "*.swift")
-add_library(FoundationMacros SHARED ${_FoundationMacrosSources})
 
-set_target_properties(FoundationMacros
-    PROPERTIES
-        ARCHIVE_OUTPUT_DIRECTORY "${FOUNDATION_MACROS_PLUGINS_DIR}"
-        LIBRARY_OUTPUT_DIRECTORY "${FOUNDATION_MACROS_PLUGINS_DIR}"
-)
-
-# Dependecies
+# SwiftSyntax Dependency
 include(FetchContent)
-if (SWIFT_BUILD_SWIFT_SYNTAX)
-    # If building in the toolchain, link against the already-built SwiftSyntax
-    target_include_directories(FoundationMacros PUBLIC "${SWIFT_HOST_LIBRARIES_DEST_DIR}")
-    target_link_directories(FoundationMacros PUBLIC "${SWIFT_HOST_LIBRARIES_DEST_DIR}")
-else()
+find_package(SwiftSyntax)
+if(NOT SwiftSyntax_FOUND)
     # If building at desk, check out and link against the SwiftSyntax repo's targets
     FetchContent_Declare(SwiftSyntax
         GIT_REPOSITORY https://github.com/apple/swift-syntax.git
         GIT_TAG 84a4bedfd1294f6ee18e6dc9ad70df55fa6230f6)
     FetchContent_MakeAvailable(SwiftSyntax)
-
-    target_link_libraries(FoundationMacros
-        SwiftSyntax
-        SwiftSyntaxMacros
-        SwiftCompilerPlugin)
+    add_executable(FoundationMacros ${_FoundationMacrosSources})
+    set(FOUNDATION_MACROS_BUILD_AS_EXECUTABLE YES)
+else()
+    add_library(FoundationMacros SHARED ${_FoundationMacrosSources})
+    target_compile_definitions(FoundationMacros PRIVATE FOUNDATION_MACROS_LIBRARY)
 endif()
 
-# Link against SwiftSyntax
+set_target_properties(FoundationMacros
+    PROPERTIES
+        ARCHIVE_OUTPUT_DIRECTORY "${FOUNDATION_MACROS_PLUGINS_DIR}"
+        LIBRARY_OUTPUT_DIRECTORY "${FOUNDATION_MACROS_PLUGINS_DIR}"
+        INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}
+)
+
+target_link_libraries(FoundationMacros
+    SwiftSyntax::SwiftSyntax
+    SwiftSyntax::SwiftSyntaxMacros
+    SwiftSyntax::SwiftDiagnostics
+    SwiftSyntax::SwiftSyntaxBuilder
+)
+
 target_compile_options(FoundationMacros PRIVATE -parse-as-library)
 target_compile_options(FoundationMacros PRIVATE
     "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -enable-experimental-feature -Xfrontend AccessLevelOnImport>")

Sources/FoundationMacros/FoundationMacros.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if !FOUNDATION_FRAMEWORK
+#if !FOUNDATION_FRAMEWORK && !FOUNDATION_MACROS_LIBRARY
 
 import SwiftSyntaxMacros
 import SwiftCompilerPlugin