Skip to content

Commit 5825030

Browse files
committed
---
yaml --- r: 345775 b: refs/heads/master c: 2fbfddd h: refs/heads/master i: 345773: 6da221e 345771: f86581f 345767: 8012bb5 345759: d594df6
1 parent f8efba7 commit 5825030

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 6df2b74282c75afe86de1f41cae853d0db0c620b
2+
refs/heads/master: 2fbfddd2ebfd7671fdde743ce4eb120e78dfd9e0
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/cmake/modules/SwiftWindowsSupport.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ function(swift_windows_generate_sdk_vfs_overlay flags)
7676
set(UCRTVersion $ENV{UCRTVersion})
7777

7878
# TODO(compnerd) use a target to avoid re-creating this file all the time
79-
configure_file("${CMAKE_SOURCE_DIR}/utils/WindowsSDKVFSOverlay.yaml.in"
80-
"${CMAKE_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
79+
configure_file("${SWIFT_SOURCE_DIR}/utils/WindowsSDKVFSOverlay.yaml.in"
80+
"${CMAKE_CURRENT_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
8181
@ONLY)
8282

8383
set(${flags}
84-
-Xclang;-ivfsoverlay;-Xclang;"${CMAKE_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
84+
-Xclang;-ivfsoverlay;-Xclang;"${CMAKE_CURRENT_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
8585
PARENT_SCOPE)
8686
endfunction()
8787

0 commit comments

Comments
 (0)