Merge branch 'dev/help-flag' into release

Kitware · Jun 16, 2020 · adce1b1 · adce1b1
2 parents 08030e1 + e2fbb1b
commit adce1b1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/tools/analyze_tracks.cxx b/tools/analyze_tracks.cxx
@@ -152,6 +152,7 @@ static int maptk_main(int argc, char const* argv[])
   arg.Initialize( argc, argv );
 
   arg.AddArgument( "--help",        argT::NO_ARGUMENT, &opt_help, "Display usage information" );
+  arg.AddArgument( "-h",            argT::NO_ARGUMENT, &opt_help, "Display usage information" );
   arg.AddArgument( "--config",      argT::SPACE_ARGUMENT, &opt_config, "Configuration file for tool" );
   arg.AddArgument( "-c",            argT::SPACE_ARGUMENT, &opt_config, "Configuration file for tool" );
   arg.AddArgument( "--output-config", argT::SPACE_ARGUMENT, &opt_out_config,

diff --git a/tools/apply_gcp.cxx b/tools/apply_gcp.cxx
@@ -232,6 +232,7 @@ static int maptk_main(int argc, char const* argv[])
   typedef kwiversys::CommandLineArguments argT;
 
   arg.AddArgument( "--help",        argT::NO_ARGUMENT, &opt_help, "Display usage information" );
+  arg.AddArgument( "-h",            argT::NO_ARGUMENT, &opt_help, "Display usage information" );
   arg.AddArgument( "--config",      argT::SPACE_ARGUMENT, &opt_config, "Configuration file for tool" );
   arg.AddArgument( "-c",            argT::SPACE_ARGUMENT, &opt_config, "Configuration file for tool" );
   arg.AddArgument( "--output-config", argT::SPACE_ARGUMENT, &opt_out_config,

diff --git a/tools/bundle_adjust_tracks.cxx b/tools/bundle_adjust_tracks.cxx
@@ -411,6 +411,7 @@ static int maptk_main(int argc, char const* argv[])
   typedef kwiversys::CommandLineArguments argT;
 
   arg.AddArgument( "--help",        argT::NO_ARGUMENT, &opt_help, "Display usage information" );
+  arg.AddArgument( "-h",            argT::NO_ARGUMENT, &opt_help, "Display usage information" );
   arg.AddArgument( "--config",      argT::SPACE_ARGUMENT, &opt_config, "Configuration file for tool" );
   arg.AddArgument( "-c",            argT::SPACE_ARGUMENT, &opt_config, "Configuration file for tool" );
   arg.AddArgument( "--output-config", argT::SPACE_ARGUMENT, &opt_out_config,

diff --git a/tools/estimate_homography.cxx b/tools/estimate_homography.cxx
@@ -167,6 +167,7 @@ static int maptk_main(int argc, char const* argv[])
   arg.Initialize( argc, argv );
 
   arg.AddArgument( "--help",        argT::NO_ARGUMENT, &opt_help, "Display usage information" );
+  arg.AddArgument( "-h",            argT::NO_ARGUMENT, &opt_help, "Display usage information" );
 
   arg.AddArgument( "--config",      argT::SPACE_ARGUMENT, &opt_config,
                    "Optional custom configuration file for the tool. Defaults are set such "

diff --git a/tools/match_matrix.cxx b/tools/match_matrix.cxx
@@ -133,6 +133,7 @@ static int maptk_main(int argc, char const* argv[])
   arg.Initialize( argc, argv );
 
   arg.AddArgument( "--help",           argT::NO_ARGUMENT, &opt_help, "Display usage information" );
+  arg.AddArgument( "-h",               argT::NO_ARGUMENT, &opt_help, "Display usage information" );
   arg.AddArgument( "--input-tracks",   argT::SPACE_ARGUMENT, &opt_in_tracks, "Input track file." );
   arg.AddArgument( "--output-matrix",  argT::SPACE_ARGUMENT, &opt_out_matrix, "Output match matrix file" );
   arg.AddArgument( "--output-frames",  argT::SPACE_ARGUMENT, &opt_out_frames, "Output frame number file" );

diff --git a/tools/pos2krtd.cxx b/tools/pos2krtd.cxx
@@ -200,6 +200,7 @@ static int maptk_main(int argc, char const* argv[])
   typedef kwiversys::CommandLineArguments argT;
 
   arg.AddArgument( "--help",        argT::NO_ARGUMENT, &opt_help, "Display usage information" );
+  arg.AddArgument( "-h",            argT::NO_ARGUMENT, &opt_help, "Display usage information" );
   arg.AddArgument( "--config",      argT::SPACE_ARGUMENT, &opt_config, "Configuration file for tool" );
   arg.AddArgument( "-c",            argT::SPACE_ARGUMENT, &opt_config, "Configuration file for tool" );
   arg.AddArgument( "--output-config", argT::SPACE_ARGUMENT, &opt_out_config,