Overlay: export Cxx interop targets to separate config files

Addresses rdar://163341811

Author: edymtt

Runtimes/Overlay/Cxx/CMakeLists.txt

@@ -39,11 +39,29 @@ target_link_libraries(swiftCxx PRIVATE
   swiftCore)
 
 install(TARGETS swiftCxx
-  EXPORT SwiftOverlayTargets
+  EXPORT SwiftCxxOverlayTargets
   ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 emit_swift_interface(swiftCxx)
 install_swift_interface(swiftCxx)
 
 embed_manifest(swiftCxx)
+
+export(EXPORT SwiftCxxOverlayTargets
+  FILE "cmake/SwiftCxxOverlay/SwiftCxxOverlayTargets.cmake")
+install(EXPORT SwiftCxxOverlayTargets
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCxxOverlay"
+  FILE "SwiftCxxOverlayTargets.cmake"
+  COMPONENT SwiftOverlayCMake)
+include(CMakePackageConfigHelpers)
+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/interface/SwiftCxxOverlayConfig.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCxxOverlay/SwiftCxxOverlayConfig.cmake"
+  INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCxxOverlay")
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCxxOverlay/SwiftCxxOverlayConfigVersion.cmake"
+  VERSION "${PROJECT_VERSION}"
+  COMPATIBILITY ExactVersion)
+install(FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCxxOverlay/SwiftCxxOverlayConfig.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCxxOverlay/SwiftCxxOverlayConfigVersion.cmake"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCxxOverlay")

Runtimes/Overlay/Cxx/cmake/interface/SwiftCxxOverlayConfig.cmake.in

@@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+include("${CMAKE_CURRENT_LIST_DIR}/SwiftCxxOverlayTargets.cmake")
+
+set(SwiftOverlay_ENABLE_REFLECTION  @SwiftOverlay_ENABLE_REFLECTION@)

Runtimes/Overlay/Cxx/cxxshim/CMakeLists.txt

@@ -6,7 +6,7 @@ target_include_directories(cxxshim INTERFACE
   $<$<COMPILE_LANGUAGE:Swift>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>>)
 
 install(TARGETS cxxshim
-  EXPORT SwiftOverlayTargets
+  EXPORT SwiftCxxOverlayTargets
   ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

Runtimes/Overlay/Cxx/libstdcxx/CMakeLists.txt

@@ -6,7 +6,7 @@ target_include_directories(libstdcxx INTERFACE
   $<$<COMPILE_LANGUAGE:Swift>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>>)
 
 install(TARGETS libstdcxx
-  EXPORT SwiftOverlayTargets
+  EXPORT SwiftCxxOverlayTargets
   ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

Runtimes/Overlay/Cxx/std/CMakeLists.txt

@@ -34,7 +34,7 @@ target_link_libraries(swiftCxxStdlib PRIVATE
 install(FILES std.apinotes
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/swift/apinotes)
 install(TARGETS swiftCxxStdlib
-  EXPORT SwiftOverlayTargets
+  EXPORT SwiftCxxOverlayTargets
   ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

Runtimes/Supplemental/Runtime/CMakeLists.txt

@@ -43,6 +43,7 @@ set(${PROJECT_NAME}_VENDOR_MODULE_DIR "${CMAKE_SOURCE_DIR}/../cmake/modules/vend
 
 find_package(SwiftCore REQUIRED)
 find_package(SwiftOverlay REQUIRED)
+find_package(SwiftCxxOverlay REQUIRED)
 find_package(SwiftDarwin)
 
 include(GNUInstallDirs)