From b2129a14f47a92dfb0c662882885d335b98811d7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 22 Jan 2024 10:56:26 -0500 Subject: [PATCH] Tests: Fix SwiftMix tests' runtime library selection on Windows Swift on Windows provides only a release runtime. Use it for C and CXX too, in all configurations, to match. Issue: #25573 Suggested-by: Saleem Abdulrasool --- Tests/SwiftMix/CMakeLists.txt | 5 ++++- Tests/SwiftMixLib/CMakeLists.txt | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Tests/SwiftMix/CMakeLists.txt b/Tests/SwiftMix/CMakeLists.txt index e8b65213f4..a4bb19b417 100644 --- a/Tests/SwiftMix/CMakeLists.txt +++ b/Tests/SwiftMix/CMakeLists.txt @@ -1,6 +1,9 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.15) project(SwiftMix C Swift) +# Swift on Windows only provides a release runtime. +set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL) + add_executable(SwiftMix CMain.c ObjCMain.m SwiftMain.swift ObjC-Swift.h) set_property(TARGET SwiftMix PROPERTY XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "ObjC-Swift.h") target_compile_options(SwiftMix PRIVATE "$<$:-Werror=objc-method-access>") diff --git a/Tests/SwiftMixLib/CMakeLists.txt b/Tests/SwiftMixLib/CMakeLists.txt index a52fc9491a..d23c6bad0b 100644 --- a/Tests/SwiftMixLib/CMakeLists.txt +++ b/Tests/SwiftMixLib/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.24) project(SwiftMixLib C CXX Swift) +# Swift on Windows only provides a release runtime. +set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL) + add_library(SwiftMixedLib lib.c lib.cpp lib.swift) add_executable(Swifty main.swift) target_link_libraries(Swifty PUBLIC SwiftMixedLib)