@@ -93,7 +93,7 @@ include(CheckSymbolExists)
9393include (CMakeDependentOption)
9494include (CheckLanguage)
9595include (GNUInstallDirs)
96- include (SwiftImplicitImport )
96+ include (SwiftCompilerCapability )
9797include (FetchContent)
9898
9999# Enable Swift for the host compiler build if we have the language. It is
@@ -414,9 +414,9 @@ set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY
414414
415415
416416if (BRIDGING_MODE STREQUAL "DEFAULT" OR NOT BRIDGING_MODE)
417- if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR "${SWIFT_HOST_VARIANT_SDK} " MATCHES "WINDOWS|ANDROID " OR (CMAKE_Swift_COMPILER AND CMAKE_Swift_COMPILER_VERSION VERSION_LESS 5.8))
417+ if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR "${SWIFT_HOST_VARIANT_SDK} " STREQUAL "WINDOWS" OR (CMAKE_Swift_COMPILER AND CMAKE_Swift_COMPILER_VERSION VERSION_LESS 5.8))
418418 # In debug builds, to workaround a problem with LLDB's `po` command (rdar://115770255).
419- # On Windows and Android , to workaround a build problem.
419+ # On Windows, to workaround a build problem.
420420 # If the host Swift version is less than 5.8, use pure mode to workaround a C++ interop compiler crash.
421421 set (BRIDGING_MODE "PURE" )
422422 else ()
@@ -682,7 +682,7 @@ option(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY
682682
683683option (SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP
684684 "Enable experimental C++ interop modules"
685- FALSE )
685+ TRUE )
686686
687687option (SWIFT_ENABLE_CXX_INTEROP_SWIFT_BRIDGING_HEADER
688688 "Install the <swift/bridging> C++ interoperability header alongside compiler"
@@ -850,6 +850,10 @@ if (CMAKE_Swift_COMPILER)
850850 swift_supports_implicit_module("backtracing"
851851 SWIFT_SUPPORTS_DISABLE_IMPLICIT_BACKTRACING_MODULE_IMPORT)
852852 message (STATUS " Implicit 'backtracing' import: ${SWIFT_SUPPORTS_DISABLE_IMPLICIT_BACKTRACING_MODULE_IMPORT} " )
853+
854+ swift_get_package_cmo_support(
855+ Swift_COMPILER_PACKAGE_CMO_SUPPORT)
856+ message (STATUS " Package CMO: ${Swift_COMPILER_PACKAGE_CMO_SUPPORT} " )
853857else ()
854858 message (STATUS "Swift Compiler (None)." )
855859endif ()
@@ -936,7 +940,7 @@ if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")
936940 set (SWIFT_NATIVE_SWIFT_TOOLS_PATH "${SWIFT_RUNTIME_OUTPUT_INTDIR} " )
937941 set (SWIFT_EXEC_FOR_SWIFT_MODULES "${CMAKE_Swift_COMPILER} " )
938942 if (NOT SWIFT_EXEC_FOR_SWIFT_MODULES)
939- message (WARNING "BOOSTRAPPING set to OFF because no Swift compiler is defined" )
943+ message (WARNING "BOOTSTRAPPING set to OFF because no Swift compiler is defined" )
940944 set (BOOTSTRAPPING_MODE "OFF" )
941945 endif ()
942946elseif (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*" )
0 commit comments