macOS smoketest: enable Distributed and Synchronization in runtimes

To make this work:
* expose SwiftCMakeConfig.h from the Core build
system, to support scenarios in which the downstream Distributed build
is leveraging the config files generated by CMake itself.
* adjust how SwiftShims is defined in `FindSwiftCore.cmake`, so that the
shims are found from C++ and that we don't get redefinition errors
when multiple module maps are in the search paths.

Fixes #83449
Addresses rdar://149241603, rdar://157165530

Author: edymtt

CMakeLists.txt

@@ -1711,7 +1711,7 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
         # To ensure incremental builds work as expected
         BUILD_ALWAYS 1
         CMAKE_ARGS
-          -DSwift_ENABLE_RUNTIMES=StringProcessing
+          -DSwift_ENABLE_RUNTIMES=StringProcessing|Synchronization|Distributed
           -DBUILD_SHARED_LIBS=YES
           -DCMAKE_Swift_COMPILER_WORKS:BOOLEAN=YES
           -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}

Runtimes/Core/runtime/CMakeLists.txt

@@ -2,6 +2,20 @@ configure_file("CMakeConfig.h.in"
   "${PROJECT_BINARY_DIR}/include/swift/Runtime/CMakeConfig.h"
   ESCAPE_QUOTES @ONLY)
 
+install(FILES
+  "${PROJECT_BINARY_DIR}/include/swift/Runtime/CMakeConfig.h"
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/swift/Runtime"
+  COMPONENT SwiftCore_development)
+
+add_library(swiftRuntimeCMakeConfig INTERFACE)
+target_include_directories(swiftRuntimeCMakeConfig INTERFACE
+  $<$<COMPILE_LANGUAGE:C,CXX>:$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/>$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>>
+  $<$<COMPILE_LANGUAGE:Swift>:$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/>$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>>)
+
+install(TARGETS swiftRuntimeCMakeConfig
+  EXPORT SwiftCoreTargets
+  COMPONENT SwiftCore_development)
+
 add_library(swiftRuntime OBJECT
     "${PROJECT_SOURCE_DIR}/CompatibilityOverride/CompatibilityOverride.cpp"
     AnyHashableSupport.cpp
@@ -94,14 +108,14 @@ target_compile_definitions(swiftRuntime
     $<$<BOOL:${SwiftCore_ENABLE_OS_TRACE_LAZY_INIT}>:-DSWIFT_USE_OS_TRACE_LAZY_INIT>)
 
 target_include_directories(swiftRuntime PRIVATE
-  "${PROJECT_BINARY_DIR}/include"
   "${CMAKE_CURRENT_SOURCE_DIR}")
 
 target_link_libraries(swiftRuntime PRIVATE
   $<$<PLATFORM_ID:Windows>:User32>
   $<$<PLATFORM_ID:Windows>:ShLwApi>
   swiftShims
-  swiftDemangling)
+  swiftDemangling
+  swiftRuntimeCMakeConfig)
 
 # FIXME: Refactor so that we're not pulling sources from the compiler files
 target_sources(swiftRuntime PRIVATE

Runtimes/Supplemental/Distributed/CMakeLists.txt

@@ -131,9 +131,6 @@ endif()
 target_include_directories(swiftDistributed PRIVATE
   # FIXME: Use of `swift/Runtime/...`, `swift/ABI/...`, and `swift/Demangling/...`
   "${${PROJECT_NAME}_SWIFTC_SOURCE_DIR}/include"
-  # For `swift/runtime/CMakeConfig.h`, which should be generated
-  # by the Core build system.
-  "${${PROJECT_NAME}_PATH_TO_SWIFT_RUNTIME_HEADERS}"
   # For llvm/support headers
   "${PROJECT_SOURCE_DIR}/include")
 
@@ -143,8 +140,22 @@ target_link_libraries(swiftDistributed PRIVATE
   swift_Concurrency
   swift_Builtin_float
   $<$<PLATFORM_ID:Android>:swiftAndroid>
-  $<$<PLATFORM_ID:Windows>:swiftWinSDK>)
-  # swiftDarwin/Libc/Platform
+  $<$<PLATFORM_ID:Windows>:swiftWinSDK>
+  $<$<PLATFORM_ID:Windows>:swiftDarwin>)
+
+if(TARGET swiftRuntimeCMakeConfig)
+  target_link_libraries(swiftDistributed PRIVATE
+    swiftRuntimeCMakeConfig)
+else()
+  if(DEFINED ${PROJECT_NAME}_PATH_TO_SWIFT_RUNTIME_HEADERS)
+    target_include_directories(swiftDistributed PRIVATE
+      # For `swift/runtime/CMakeConfig.h`, which should be generated
+      # by the Core build system.
+      "${${PROJECT_NAME}_PATH_TO_SWIFT_RUNTIME_HEADERS}")
+  else()
+    message(FATAL_ERROR "To be able to find the CMakeConfig.h header, please ensure that either ${PROJECT_NAME}_PATH_TO_SWIFT_RUNTIME_HEADERS is set, or that swiftRuntimeCMakeConfig target is present ")
+  endif()
+endif()
 
 install(TARGETS swiftDistributed
   EXPORT SwiftDistributedTargets

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake

@@ -288,7 +288,10 @@ find_path(SwiftShims_INCLUDE_DIR "shims/module.modulemap" HINTS
   ${SwiftShims_INCLUDE_DIR_HINTS})
 add_library(swiftShims INTERFACE IMPORTED GLOBAL)
 set_target_properties(swiftShims PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${SwiftShims_INCLUDE_DIR}/shims")
+  INTERFACE_INCLUDE_DIRECTORIES "${SwiftShims_INCLUDE_DIR}/..;${SwiftShims_INCLUDE_DIR}/shims")
+target_compile_options(swiftShims INTERFACE
+  "$<$<AND:$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xcc -DSWIFT_STATIC_STDLIB>"
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc -fmodule-map-file=\"${SwiftShims_INCLUDE_DIR}/shims/module.modulemap\">")
 
 find_package_handle_standard_args(SwiftCore DEFAULT_MSG
   SwiftCore_LIBRARY SwiftCore_INCLUDE_DIR