diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDocumentation.cxx | 6 | ||||
| -rw-r--r-- | Source/cmDumpDocumentation.cxx | 5 | ||||
| -rw-r--r-- | Source/cmStandardIncludes.h | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx index 390ab5b..21cde88 100644 --- a/Source/cmDocumentation.cxx +++ b/Source/cmDocumentation.cxx @@ -122,7 +122,7 @@ cmDocumentation::cmDocumentation() //---------------------------------------------------------------------------- void cmDocumentation::PrintCopyright(std::ostream& os) { - os << "CMake version " CMake_VERSION_STRING "\n"; + os << "CMake version " CMake_VERSION_FULL "\n"; for(const cmDocumentationEntry* op = cmDocumentationCopyright; op->brief; ++op) { @@ -144,7 +144,7 @@ void cmDocumentation::PrintCopyright(std::ostream& os) //---------------------------------------------------------------------------- void cmDocumentation::PrintVersion(std::ostream& os) { - os << "CMake version " CMake_VERSION_STRING "\n"; + os << "CMake version " CMake_VERSION_FULL "\n"; } //---------------------------------------------------------------------------- @@ -764,7 +764,7 @@ void cmDocumentation::PrintDocumentationMan(std::ostream& os) this->CreateManDocumentation(); os << ".TH CMake 1 \"" << cmSystemTools::GetCurrentDateTime("%B %d, %Y").c_str() - << "\" \"CMake " CMake_VERSION_STRING "\"\n"; + << "\" \"CMake " CMake_VERSION_FULL "\"\n"; this->Print(ManForm, os); } diff --git a/Source/cmDumpDocumentation.cxx b/Source/cmDumpDocumentation.cxx index edee6d6..0b474c4 100644 --- a/Source/cmDumpDocumentation.cxx +++ b/Source/cmDumpDocumentation.cxx @@ -66,7 +66,7 @@ int DumpHTML(const char* outname) cmDocumentation doc; std::vector<cmDocumentationEntry> commands; cmi.GetCommandDocumentation(commands); - doc.AddSection("Documentation for Commands of CMake " CMake_VERSION_STRING, + doc.AddSection("Documentation for Commands of CMake " CMake_VERSION_FULL, &commands[0]); doc.Print(cmDocumentation::HTMLForm, fout); @@ -78,12 +78,15 @@ int DumpForCoverage() cmake cmi; cmDocumentation doc; std::vector<cmDocumentationEntry> commands; + std::vector<cmDocumentationEntry> generators; cmi.GetCommandDocumentation(commands); + cmi.GetGeneratorDocumentation(generators); doc.SetNameSection(cmDocumentationName); doc.SetUsageSection(cmDocumentationUsage); doc.SetDescriptionSection(cmDocumentationDescription); doc.SetOptionsSection(cmDocumentationOptions); doc.SetCommandsSection(&commands[0]); + doc.SetGeneratorsSection(&generators[0]); doc.PrintDocumentation(cmDocumentation::Usage, std::cout); doc.PrintDocumentation(cmDocumentation::Full, std::cout); doc.PrintDocumentation(cmDocumentation::HTML, std::cout); diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 0b3aef5..98211b6 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -28,7 +28,11 @@ // CMAKE_NO_STD_NAMESPACE, and other macros. #include "cmConfigure.h" -#define CMake_VERSION_STRING \ +#define CMake_VERSION \ + CMAKE_TO_STRING(CMake_VERSION_MAJOR) "." \ + CMAKE_TO_STRING(CMake_VERSION_MINOR) + +#define CMake_VERSION_FULL \ CMAKE_TO_STRING(CMake_VERSION_MAJOR) "." \ CMAKE_TO_STRING(CMake_VERSION_MINOR) "." \ CMAKE_TO_STRING(CMake_VERSION_PATCH) |