mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-13 01:29:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'swift-exe-module-name' into release-3.29

Browse Source 
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
This commit is contained in:
Brad King
2024-02-26 15:18:43 +00:00
committed by Kitware Robot
parent 2c69f8abee f292e28b84
commit 083afc88db
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmNinjaTargetGenerator.cxx
+2 -4
View File
@@ -2024,11 +2024,9 @@ void cmNinjaTargetGenerator::WriteSwiftObjectBuildStatement(
this->LocalGenerator->AppendFlags(
vars["FLAGS"], { emitModuleFlag, modulePathFlag, moduleFilepath });
objBuild.Outputs.push_back(moduleFilepath);
std::string const moduleNameFlag = "-module-name";
this->LocalGenerator->AppendFlags(
vars["FLAGS"], cmStrCat(moduleNameFlag, ' ', moduleName));
}
this->LocalGenerator->AppendFlags(vars["FLAGS"],
cmStrCat("-module-name ", moduleName));
if (target.GetType() != cmStateEnums::EXECUTABLE) {
std::string const libraryLinkNameFlag = "-module-link-name";
Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt
+3 -1
View File
@@ -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
Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake
+4
View File
@@ -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)