From 0015cb95de6e2031dfede8b7ab5ab82e1b6c3aea Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 21 Nov 2022 17:09:21 -0500 Subject: cmGlobalNinjaGenerator: fix comment typo --- Source/cmGlobalNinjaGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index aa1ded0..e334666 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1256,7 +1256,7 @@ void cmGlobalNinjaGenerator::AppendTargetOutputs( cmGeneratorTarget const* target, cmNinjaDeps& outputs, const std::string& config, cmNinjaTargetDepends depends) const { - // for frameworks, we want the real name, not smple name + // for frameworks, we want the real name, not sample name // frameworks always appear versioned, and the build.ninja // will always attempt to manage symbolic links instead // of letting cmOSXBundleGenerator do it. -- cgit v0.12 From b7509d6bf8de0af7077da894b124a40fbf73c935 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 21 Nov 2022 10:22:41 -0500 Subject: cmNinjaNormalTargetGenerator: fix grammar in verbose comment --- Source/cmNinjaNormalTargetGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 21409d7..5cc7987 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -117,7 +117,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules( #ifdef NINJA_GEN_VERBOSE_FILES cmGlobalNinjaGenerator::WriteDivider(this->GetRulesFileStream()); this->GetRulesFileStream() - << "# Rules for each languages for " + << "# Rules for each language for " << cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType()) << " target " << this->GetTargetName() << "\n\n"; #endif -- cgit v0.12 From a971fcfde79abe9ccf19e77a2a71b9fbfccce439 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 21 Nov 2022 17:08:27 -0500 Subject: cmNinjaNormalTargetGenerator: use `cmStrCat` --- Source/cmNinjaNormalTargetGenerator.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 5cc7987..6ec1781 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -64,9 +64,9 @@ void cmNinjaNormalTargetGenerator::Generate(const std::string& config) { std::string lang = this->GeneratorTarget->GetLinkerLanguage(config); if (this->TargetLinkLanguage(config).empty()) { - cmSystemTools::Error("CMake can not determine linker language for " - "target: " + - this->GetGeneratorTarget()->GetName()); + cmSystemTools::Error( + cmStrCat("CMake can not determine linker language for target: ", + this->GetGeneratorTarget()->GetName())); return; } -- cgit v0.12 From c53748cc09677fc8545251598d364c44240c846f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 21 Nov 2022 09:13:35 -0500 Subject: Tests/RunCMake/CXXModules: mark IMPORTED targets as INTERFACE Now that `Ninja` generators will know to generate rules for `IMPORTED` targets, mark these as `INTERFACE` to avoid requirements of actual artifacts. --- .../RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported.cmake | 2 +- Tests/RunCMake/CXXModules/FileSetModulesInterfaceImported.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported.cmake b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported.cmake index 9ff5606..d287198 100644 --- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported.cmake +++ b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported.cmake @@ -1,4 +1,4 @@ -add_library(module-header SHARED IMPORTED) +add_library(module-header INTERFACE IMPORTED) target_sources(module-header INTERFACE FILE_SET fs TYPE CXX_MODULE_HEADER_UNITS FILES diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterfaceImported.cmake b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceImported.cmake index 6640ae9..392149f 100644 --- a/Tests/RunCMake/CXXModules/FileSetModulesInterfaceImported.cmake +++ b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceImported.cmake @@ -1,4 +1,4 @@ -add_library(module SHARED IMPORTED) +add_library(module INTERFACE IMPORTED) target_sources(module INTERFACE FILE_SET fs TYPE CXX_MODULES FILES -- cgit v0.12