[Runtimes][CMake] Refactor FindSwiftCore to put focus on targets... #82035

edymtt · 2025-06-05T21:16:35Z

Notable changes/flags:

Append to variables controlling paths and names, to allow for user
configuration
add SwiftCore_USE_STATIC_LIBS to generate static archives
use PlatformInfo variables to get the platform and arch subfolders
(where appropriate)
add include guards to ensure PlatformInfo and FindSwiftCore are
included once in a project
search for the appropriate static or import library under Windows

Addresses rdar://152838903

compnerd

I think that this is going in the right direction.

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake

etcwilde · 2025-06-05T21:38:09Z

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake

+    ${SwiftCore_INCLUDE_DIR_HINTS})
+find_library(SwiftCore_LIBRARY
+  NAMES
+    "libswiftCore.tbd"


I think we want to keep searching for a static archive separate from searching for a shared object. CMake will happily annotate the imported swiftCore incorrectly down below on lines 123 - 127, but I don't think the user will be as happy.

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake

compnerd · 2025-06-10T21:27:54Z

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake

+      "${Swift_SDKROOT}/usr/lib/swift/linux")
+    list(APPEND SwiftCore_LIBRARY_HINTS
+      "${Swift_SDKROOT}/usr/lib/swift/linux")
+    list(APPEND SwiftCore_NAMES libswiftCore.so)


I think that folding the cases with generator expressions would be reasonable.

I would need to double check if I can use generator expressions in this context -- my understanding is that we can employ those when setting properties on targets

I cobbled up a small example that uses a generator expression to provide the file name to find_library, but that does lead to the library not being found.

Do you have any link to documentation or forums that shows how to use generator expressions in this context? From a quick search, the official CMake Documentation only mentions they can be used in target properties and file(GENERATE)

Example CMake and configuration/generation output

cmake_minimum_required(VERSION 3.29) project(Foo LANGUAGES Swift) find_path(SwiftCore_INCLUDE_DIR "Swift.swiftmodule" NO_CMAKE_FIND_ROOT_PATH HINTS "${CMAKE_OSX_SYSROOT}/usr/lib/swift") find_library(SwiftCore_LIBRARY NAMES $<<PLATFORM_ID:Darwin>,libswiftCore.tbd,libswiftCore.so> NO_CMAKE_FIND_ROOT_PATH HINTS "${CMAKE_OSX_SYSROOT}/usr/lib/swift") MESSAGE(STATUS "Library path for SwiftCore: ${SwiftCore_LIBRARY}") add_library(swiftCore SHARED IMPORTED GLOBAL) set_target_properties(swiftCore PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${SwiftCore_INCLUDE_DIR}") set_target_properties(swiftCore PROPERTIES IMPORTED_IMPLIB "${SwiftCore_LIBRARY}") add_library(Foo foo.swift) target_link_libraries(Foo PRIVATE swiftCore)

... -- Library path for SwiftCore: SwiftCore_LIBRARY-NOTFOUND -- Configuring done (0.8s) -- Generating done (0.0s) -- Build files have been written to: .../generator_expressions_with_find_library_sandbox/build_dynamic ninja: Entering directory `build_dynamic' ninja: error: 'SwiftCore_LIBRARY-NOTFOUND', needed by 'libFoo.dylib', missing and no known rule to make it

compnerd · 2025-06-10T21:28:24Z

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake

+    "${Swift_SDKROOT}/usr/lib/swift"
+    "$ENV{SDKROOT}/usr/lib/swift/${SwiftCore_PLATFORM_SUBDIR}/${SwiftCore_ARCH_SUBDIR}"
+    "$ENV{SDKROOT}/usr/lib/swift")
+  list(APPEND SwiftCore_NAMES libswiftCore.lib)


This is the static library name, swiftCore.lib is the import library. Please add the static case as well.

Amended in 89b7929 -- please note I did not touch the search paths, as I don't remember seeing any swift_static in my Swift installation for Windows.

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake

edymtt · 2025-06-11T20:00:36Z

@swift-ci please test Windows

edymtt · 2025-06-11T22:02:34Z

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake

-    INTERFACE_INCLUDE_DIRECTORIES "${SwiftCore_INCLUDE_DIR}")
-  find_package_handle_standard_args(SwiftCore DEFAULT_MSG
-    SwiftCore_IMPLIB SwiftCore_INCLUDE_DIR)
+  #list(APPEND SwiftCore_NAMES libswiftCore.tbd)


Left this commented while I was experimenting with generator expressions

Suggested change

#list(APPEND SwiftCore_NAMES libswiftCore.tbd)

list(APPEND SwiftCore_NAMES libswiftCore.tbd)

...instead of platforms. Notable changes/flags: * Append to variables controlling paths and names, to allow for user configuration * add `SwiftCore_USE_STATIC_LIBS` to generate static archives * use PlatformInfo variables to get the platform and arch subfolders (where appropriate) * add include guards to ensure PlatformInfo and FindSwiftCore are included once in a project * search for the appropriate static or import library under Windows Addresses rdar://152838903

edymtt · 2025-06-17T22:41:13Z

@swift-ci please test

edymtt · 2025-06-17T22:41:21Z

@swift-ci please build toolchain

edymtt · 2025-06-18T14:03:57Z

macOS failed is unrelated to this change and happening in other PRs

20:53:19  ********************
20:53:19  Failed Tests (1):
20:53:19    Swift(iphonesimulator-x86_64) :: Sema/enum_raw_representable_object_literals.swift

Similar situation for Windows

× Test debugDescription() recorded an issue at PredicateTests.swift:361:9: Expectation failed: (predicate.description → "capture1 (Swift.Int): 3
× Test debugDescription() recorded an issue at PredicateTests.swift:376:9: Expectation failed: (debugDescription → "FoundationEssentials.Predicate<Pack{FoundationEssentialsTests.(unknown context at $7ff6d3ccd978).PredicateTests.Object ...

edymtt · 2025-06-18T19:17:45Z

@swift-ci please test Windows

edymtt · 2025-06-18T19:17:52Z

@swift-ci please build toolchain Windows

edymtt · 2025-06-23T03:40:36Z

@swift-ci please test macOS

edymtt · 2025-06-23T03:40:47Z

@swift-ci please test Windows

edymtt · 2025-06-23T13:36:58Z

@swift-ci please test macOS

edymtt · 2025-06-23T13:40:26Z

@swift-ci please test Windows

edymtt · 2025-06-26T13:55:55Z

Merging to unblock the addition of Distributed to the new runtime builds -- I will address any additional feedback in subsequent PR that change FindSwiftCore.cmake (very likely #81982)

edymtt mentioned this pull request Jun 5, 2025

[Runtimes][CMake] Find Shims, OnoneSupport and Concurrency in FindSwi… #81982

Open

compnerd reviewed Jun 5, 2025

View reviewed changes

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake Outdated Show resolved Hide resolved

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake Outdated Show resolved Hide resolved

etcwilde reviewed Jun 5, 2025

View reviewed changes

compnerd reviewed Jun 10, 2025

View reviewed changes

etcwilde reviewed Jun 11, 2025

View reviewed changes

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake Outdated Show resolved Hide resolved

etcwilde reviewed Jun 11, 2025

View reviewed changes

Runtimes/Supplemental/cmake/modules/FindSwiftCore.cmake Outdated Show resolved Hide resolved

edymtt commented Jun 11, 2025

View reviewed changes

edymtt force-pushed the edymtt/refactor-findswiftcore branch from 89b7929 to 13db77a Compare June 17, 2025 20:35

edymtt force-pushed the edymtt/refactor-findswiftcore branch from 13db77a to 4efbe16 Compare June 17, 2025 22:40

edymtt marked this pull request as ready for review June 23, 2025 14:02

edymtt requested a review from justice-adams-apple as a code owner June 23, 2025 14:02

edymtt merged commit 4686897 into swiftlang:main Jun 26, 2025
8 checks passed

	#list(APPEND SwiftCore_NAMES libswiftCore.tbd)
	list(APPEND SwiftCore_NAMES libswiftCore.tbd)

[Runtimes][CMake] Refactor FindSwiftCore to put focus on targets... #82035

[Runtimes][CMake] Refactor FindSwiftCore to put focus on targets... #82035

Conversation

edymtt commented Jun 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

compnerd left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

etcwilde Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

compnerd Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

edymtt Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

edymtt Jun 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

compnerd Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

edymtt Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

edymtt commented Jun 11, 2025

Uh oh!

edymtt Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

edymtt commented Jun 17, 2025

Uh oh!

edymtt commented Jun 17, 2025

Uh oh!

edymtt commented Jun 18, 2025

Uh oh!

edymtt commented Jun 18, 2025

Uh oh!

edymtt commented Jun 18, 2025

Uh oh!

edymtt commented Jun 23, 2025

Uh oh!

edymtt commented Jun 23, 2025

Uh oh!

edymtt commented Jun 23, 2025

Uh oh!

edymtt commented Jun 23, 2025

Uh oh!

edymtt commented Jun 26, 2025

Uh oh!

Uh oh!

Uh oh!

edymtt commented Jun 5, 2025 •

edited

Loading

edymtt Jun 10, 2025 •

edited

Loading

edymtt Jun 11, 2025 •

edited

Loading