diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-23 12:10:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-23 12:10:52 (GMT) |
| commit | c924d33bec26c88fa120396192992cfc3b959039 (patch) | |
| tree | deb097a5a894d2c60ae0951aa9641e91d278c472 | |
| parent | 22fdf42e92785b7a154e59e0ef2e9bf829461061 (diff) | |
| parent | c53748cc09677fc8545251598d364c44240c846f (diff) | |
| download | CMake-c924d33bec26c88fa120396192992cfc3b959039.zip CMake-c924d33bec26c88fa120396192992cfc3b959039.tar.gz CMake-c924d33bec26c88fa120396192992cfc3b959039.tar.bz2 | |
Merge topic 'cxxmodule-module-support-tweaks'
c53748cc09 Tests/RunCMake/CXXModules: mark IMPORTED targets as INTERFACE
a971fcfde7 cmNinjaNormalTargetGenerator: use `cmStrCat`
b7509d6bf8 cmNinjaNormalTargetGenerator: fix grammar in verbose comment
0015cb95de cmGlobalNinjaGenerator: fix comment typo
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7943
4 files changed, 7 insertions, 7 deletions
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. diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 21409d7..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; } @@ -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 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 |