diff options
| author | Alex Turbov <i.zaufi@gmail.com> | 2022-10-26 11:09:54 (GMT) |
|---|---|---|
| committer | Alex Turbov <i.zaufi@gmail.com> | 2022-11-17 12:37:13 (GMT) |
| commit | 6e3e8827faf0bf2363ecf9035b5573e715e52fb2 (patch) | |
| tree | 21681997c33a843eb61cd66d76651b5a3b4f220c /Source/cmGlobalNMakeMakefileGenerator.cxx | |
| parent | e99a4acbcd2f7ec8e5cefbf996af1dfa95e61a27 (diff) | |
| download | CMake-6e3e8827faf0bf2363ecf9035b5573e715e52fb2.zip CMake-6e3e8827faf0bf2363ecf9035b5573e715e52fb2.tar.gz CMake-6e3e8827faf0bf2363ecf9035b5573e715e52fb2.tar.bz2 | |
Refactor: `cmGlobalGeneratorFactory::GetDocumentation` returns entry
Before, a documentation entry was in/out parameter.
Now it's a normal return value.
This also makes possible to eliminate defaulted default ctor
for `cmDocumentationEntry` for C++ 11.
Also, simplify `cmake::AppendGlobalGeneratorsDocumentation()`.
Diffstat (limited to 'Source/cmGlobalNMakeMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNMakeMakefileGenerator.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx index eabacf6..cb53850 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.cxx +++ b/Source/cmGlobalNMakeMakefileGenerator.cxx @@ -8,7 +8,6 @@ #include "cmsys/RegularExpression.hxx" -#include "cmDocumentationEntry.h" #include "cmDuration.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" @@ -80,11 +79,10 @@ void cmGlobalNMakeMakefileGenerator::CheckNMakeFeatures() cmSystemTools::OP_LESS, this->NMakeVersion, "9"); } -void cmGlobalNMakeMakefileGenerator::GetDocumentation( - cmDocumentationEntry& entry) +cmDocumentationEntry cmGlobalNMakeMakefileGenerator::GetDocumentation() { - entry.Name = cmGlobalNMakeMakefileGenerator::GetActualName(); - entry.Brief = "Generates NMake makefiles."; + return { cmGlobalNMakeMakefileGenerator::GetActualName(), + "Generates NMake makefiles." }; } void cmGlobalNMakeMakefileGenerator::PrintCompilerAdvice( @@ -128,12 +126,8 @@ void cmGlobalNMakeMakefileGenerator::PrintBuildCommandAdvice(std::ostream& os, if (jobs != cmake::NO_BUILD_PARALLEL_LEVEL) { // nmake does not support parallel build level // see https://msdn.microsoft.com/en-us/library/afyyse50.aspx - - /* clang-format off */ - os << - "Warning: NMake does not support parallel builds. " - "Ignoring parallel build command line option.\n"; - /* clang-format on */ + os << "Warning: NMake does not support parallel builds. " + "Ignoring parallel build command line option.\n"; } this->cmGlobalUnixMakefileGenerator3::PrintBuildCommandAdvice( |