Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Runtimes: inject Windows SDK clang modules #80340

Merged
merged 1 commit into from
Mar 28, 2025
Merged

Runtimes: inject Windows SDK clang modules #80340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Runtimes/Overlay/Windows/CRT/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ target_compile_definitions(swiftCRT PRIVATE
target_compile_options(swiftCRT PRIVATE
"SHELL:-Xcc -D_USE_MATH_DEFINES")
target_link_libraries(swiftCRT PRIVATE
ClangModules
swiftCore)

install(TARGETS swiftCRT
Expand Down
1 change: 1 addition & 0 deletions Runtimes/Overlay/Windows/WinSDK/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set_target_properties(swiftWinSDK PROPERTIES
target_compile_definitions(swiftCRT PRIVATE
$<$<BOOL:${SwiftOverlay_ENABLE_REFLECTION}>:SWIFT_ENABLE_REFLECTION>)
target_link_libraries(swiftWinSDK PRIVATE
ClangModules
swiftCore)

install(TARGETS swiftWinSDK
Expand Down
42 changes: 42 additions & 0 deletions Runtimes/Overlay/Windows/clang/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,46 @@

file(TO_CMAKE_PATH "$ENV{WindowsSdkDir}" WindowsSdkDir)
file(TO_CMAKE_PATH "$ENV{WindowsSDKVersion}" WindowsSDKVersion)
file(TO_CMAKE_PATH "$ENV{UniversalCRTSdkDir}" UniversalCRTSdkDir)
file(TO_CMAKE_PATH "$ENV{UCRTVersion}" UCRTVersion)
file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" VCToolsInstallDir)

file(CONFIGURE
OUTPUT windows-sdk-overlay.yaml
CONTENT [[
---
version: 0
case-sensitive: false
use-external-names: false
roots:
- name: "@WindowsSdkDir@/Include/@WindowsSDKVersion@/um"
type: directory
contents:
- name: module.modulemap
type: file
external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/winsdk.modulemap"
- name: "@UniversalCRTSdkDir@/Include/@UCRTVersion@/ucrt"
type: directory
contents:
- name: module.modulemap
type: file
external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/ucrt.modulemap"
- name: "@VCToolsInstallDir@include"
type: directory
contents:
- name: module.modulemap
type: file
external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/vcruntime.modulemap"
- name: vcruntime.apinotes
type: file
external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/vcruntime.apinotes"
]]
ESCAPE_QUOTES @ONLY NEWLINE_STYLE LF)

add_library(ClangModules INTERFACE)
target_compile_options(ClangModules INTERFACE
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-vfsoverlay ${CMAKE_CURRENT_BINARY_DIR}/windows-sdk-overlay.yaml>")

install(FILES
ucrt.modulemap
vcruntime.apinotes
Expand Down
1 change: 1 addition & 0 deletions Runtimes/Overlay/clang/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ set_target_properties(swift_Builtin_float PROPERTIES
target_compile_options(swift_Builtin_float PRIVATE
"$<$<PLATFORM_ID:Darwin>:SHELL:-Xfrontend -module-abi-name -Xfrontend Darwin>")
target_link_libraries(swift_Builtin_float PRIVATE
$<$<PLATFORM_ID:Windows>:ClangModules>
swiftCore)

install(TARGETS swift_Builtin_float
Expand Down