diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-26 15:18:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-26 15:19:22 (GMT) |
| commit | 610e5b3d94ed4f5186a30501747ed3e2ad9e8446 (patch) | |
| tree | bc8f7e4dac5af546bf402eba870ebf0daa2a99eb /Tests/RunCMake | |
| parent | 97a1486cecfbe9c66ceb6e9ccb5afa3a37f29f42 (diff) | |
| parent | f292e28b84a8df50a8c4523c04f5e9eacc2ee772 (diff) | |
| download | CMake-610e5b3d94ed4f5186a30501747ed3e2ad9e8446.zip CMake-610e5b3d94ed4f5186a30501747ed3e2ad9e8446.tar.gz CMake-610e5b3d94ed4f5186a30501747ed3e2ad9e8446.tar.bz2 | |
Merge topic 'swift-exe-module-name'
f292e28b84 Swift: Ninja: Pass module name to all swift builds
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9282
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt b/Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt index 85767eb..7e7fc7d 100644 --- a/Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt +++ b/Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt @@ -1,3 +1,5 @@ .*swiftc(.exe)? .* -parse-as-library -static -emit-module .* -module-name StaticLibrary [^ ]* -.*swiftc(.exe)? .* -parse-as-library -emit-module .* -module-name DynamicLibrary +.*swiftc(.exe)? .* -parse-as-library -emit-module .* -module-name DynamicLibrary [^ +]* +.*swiftc(.exe)? .* -j [0-9]* -num-threads [0-9]* -c -module-name Executable diff --git a/Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake b/Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake index 7127751..af4aede 100644 --- a/Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake +++ b/Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake @@ -6,3 +6,7 @@ enable_language(Swift) add_library(StaticLibrary STATIC L.swift) add_library(DynamicLibrary SHARED L.swift) +add_executable(Executable E.swift) + +add_dependencies(DynamicLibrary StaticLibrary) +add_dependencies(Executable DynamicLibrary) |