diff options
| author | Brad King <brad.king@kitware.com> | 2024-04-24 13:10:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-04-24 13:10:58 (GMT) |
| commit | 145418f7fda29842906881c97adb626ce47ae63d (patch) | |
| tree | 4c83406782a65cae2d0ecc957619fdeac7eb398d | |
| parent | a0957f4233b7ea8738390ca0a5c78cb671dbdc3a (diff) | |
| parent | c5ef7fac239d24e72ae09d48c3ab4ae02e57603d (diff) | |
| download | CMake-145418f7fda29842906881c97adb626ce47ae63d.zip CMake-145418f7fda29842906881c97adb626ce47ae63d.tar.gz CMake-145418f7fda29842906881c97adb626ce47ae63d.tar.bz2 | |
Merge topic 'ninja-swift-verbosity'
c5ef7fac23 Swift/Ninja: Add description to Swift object build steps
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9451
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/Swift/IncrementalSwift-second-stdout.txt | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index e2642b2..c52a012 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -1992,6 +1992,11 @@ void cmNinjaTargetGenerator::WriteSwiftObjectBuildStatement( std::string const moduleFilepath = this->ConvertToNinjaPath(cmStrCat(moduleDirectory, '/', moduleFilename)); + vars.emplace("description", + cmStrCat("Building Swift Module '", moduleName, "' with ", + sources.size(), + sources.size() == 1 ? " source" : " sources")); + bool const isSingleOutput = [this, compileMode]() -> bool { bool isMultiThread = false; if (cmValue numThreadStr = diff --git a/Tests/RunCMake/Swift/IncrementalSwift-second-stdout.txt b/Tests/RunCMake/Swift/IncrementalSwift-second-stdout.txt index 8e5b97c..ccd8aee 100644 --- a/Tests/RunCMake/Swift/IncrementalSwift-second-stdout.txt +++ b/Tests/RunCMake/Swift/IncrementalSwift-second-stdout.txt @@ -1,3 +1,3 @@ -.*Building Swift object A.swiftmodule CMakeFiles(/|\\)A.dir(/|\\)a.swift.o(bj)? -.*Building Swift object B.swiftmodule CMakeFiles(/|\\)B.dir(/|\\)b.swift.o(bj)? +.*Building Swift Module 'A' with 1 source +.*Building Swift Module 'B' with 1 source FAILED: B.swiftmodule CMakeFiles(/|\\)B.dir(/|\\)b.swift.o(bj)? |