Merge pull request #83244 from compnerd/interface

Overlay: perform micro-optimization on Windows, correct export

Author: compnerd

Runtimes/Overlay/Windows/CRT/CMakeLists.txt

@@ -12,11 +12,16 @@ set_target_properties(swiftCRT PROPERTIES
 target_compile_definitions(swiftCRT PRIVATE
   $<$<BOOL:${SwiftOverlay_ENABLE_REFLECTION}>:SWIFT_ENABLE_REFLECTION>)
 target_compile_options(swiftCRT PRIVATE
+  "SHELL:-Xfrontend -disable-force-load-symbols"
   "SHELL:-Xcc -D_USE_MATH_DEFINES")
 target_link_libraries(swiftCRT PRIVATE
   ClangModules
   swiftCore)
 
+# FIXME: Why is this not implicitly in the interface flags?
+target_include_directories(swiftCRT INTERFACE
+  "$<$<COMPILE_LANGUAGE:Swift>:$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${SwiftCore_INSTALL_SWIFTMODULEDIR}>>")
+
 install(TARGETS swiftCRT
   EXPORT SwiftOverlayTargets
   ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"

Runtimes/Overlay/Windows/WinSDK/CMakeLists.txt

@@ -3,12 +3,18 @@ add_library(swiftWinSDK
   WinSDK.swift)
 set_target_properties(swiftWinSDK PROPERTIES
   Swift_MODULE_NAME WinSDK)
-target_compile_definitions(swiftCRT PRIVATE
+target_compile_definitions(swiftWinSDK PRIVATE
   $<$<BOOL:${SwiftOverlay_ENABLE_REFLECTION}>:SWIFT_ENABLE_REFLECTION>)
+target_compile_options(swiftWinSDK PRIVATE
+  "SHELL:-Xfrontend -disable-force-load-symbols")
 target_link_libraries(swiftWinSDK PRIVATE
   ClangModules
   swiftCore)
 
+# FIXME: Why is this not implicitly in the interface flags?
+target_include_directories(swiftWinSDK INTERFACE
+  "$<$<COMPILE_LANGUAGE:Swift>:$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${SwiftCore_INSTALL_SWIFTMODULEDIR}>>")
+
 install(TARGETS swiftWinSDK
   EXPORT SwiftOverlayTargets
   ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"