mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-24 23:28:32 -05:00
Merge topic 'cpack-improve-unknown-generator-error'
f29e2292c9cpack: When given an unknown generator print out all valid generatorseba7273c20cpack: Better error message when generator doesn't exist. Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: David Cole <dlrdave@aol.com> Merge-request: !2580
This commit is contained in:
+16
-2
@@ -21,6 +21,7 @@
|
||||
#include "cmCPackLog.h"
|
||||
#include "cmDocumentation.h"
|
||||
#include "cmDocumentationEntry.h"
|
||||
#include "cmDocumentationFormatter.h"
|
||||
#include "cmGlobalGenerator.h"
|
||||
#include "cmMakefile.h"
|
||||
#include "cmStateSnapshot.h"
|
||||
@@ -358,8 +359,21 @@ int main(int argc, char const* const* argv)
|
||||
cpackGenerator->SetTraceExpand(traceExpand);
|
||||
} else {
|
||||
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
||||
"Cannot initialize CPack generator: " << gen
|
||||
<< std::endl);
|
||||
"Could not create CPack generator: " << gen
|
||||
<< std::endl);
|
||||
// Print out all the valid generators
|
||||
cmDocumentation generatorDocs;
|
||||
std::vector<cmDocumentationEntry> v;
|
||||
for (auto const& g : generators.GetGeneratorsList()) {
|
||||
cmDocumentationEntry e;
|
||||
e.Name = g.first;
|
||||
e.Brief = g.second;
|
||||
v.push_back(std::move(e));
|
||||
}
|
||||
generatorDocs.SetSection("Generators", v);
|
||||
std::cerr << "\n";
|
||||
generatorDocs.PrintDocumentation(cmDocumentation::ListGenerators,
|
||||
std::cerr);
|
||||
parsed = 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user