Skip to content

Commit 2075f8c

Browse files
committed
---
yaml --- r: 323007 b: refs/heads/tensorflow-next c: b4ec99b h: refs/heads/master i: 323005: 0e8fb53 323003: bbf6de1 322999: a031944 322991: 108af1e 322975: ea15770 322943: c3062f7
1 parent 3b5bf78 commit 2075f8c

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
14611461
refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
14621462
refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
14631463
refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
1464-
refs/heads/tensorflow-next: 1c5aece0c5caa776d7e1d0b702250bdf4b66e97f
1464+
refs/heads/tensorflow-next: b4ec99bc6a9305808ecc2fa6b1c5ac6a99385a83

branches/tensorflow-next/cmake/modules/AddSwift.cmake

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1914,6 +1914,20 @@ function(add_swift_target_library name)
19141914
GYB_SOURCES ${SWIFTLIB_GYB_SOURCES}
19151915
)
19161916

1917+
if(sdk STREQUAL WINDOWS)
1918+
if(SWIFT_COMPILER_IS_MSVC_LIKE)
1919+
if (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDebugDLL)
1920+
target_compile_options(${VARIANT_NAME} PRIVATE /MDd /D_DLL /D_DEBUG)
1921+
elseif (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDebug)
1922+
target_compile_options(${VARIANT_NAME} PRIVATE /MTd /U_DLL /D_DEBUG)
1923+
elseif (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDLL)
1924+
target_compile_options(${VARIANT_NAME} PRIVATE /MD /D_DLL /U_DEBUG)
1925+
elseif (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreaded)
1926+
target_compile_options(${VARIANT_NAME} PRIVATE /MT /U_DLL /U_DEBUG)
1927+
endif()
1928+
endif()
1929+
endif()
1930+
19171931
if(NOT SWIFTLIB_OBJECT_LIBRARY)
19181932
# Add dependencies on the (not-yet-created) custom lipo target.
19191933
foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})

0 commit comments

Comments
 (0)