1 files changed, 11 insertions, 0 deletions
diff --git a/src/option-parser.cc b/src/option-parser.cc
index 71c2e203..263ef176 100644
--- a/src/option-parser.cc
+++ b/src/option-parser.cc
@@ -50,6 +50,10 @@ OptionParser::OptionParser(const char* program_name, const char* description)
     : program_name_(program_name),
       description_(description),
       on_error_([this](const std::string& message) { DefaultError(message); }) {
+
+  // Add common options
+  AddHelpOption();
+  AddVersionOption();
 }
 
 void OptionParser::AddOption(const Option& option) {
@@ -96,6 +100,13 @@ void OptionParser::AddHelpOption() {
   });
 }
 
+void OptionParser::AddVersionOption() {
+  AddOption("version", "Print version information", [this]() {
+    printf("%s\n", WABT_VERSION_INFO);
+    exit(0);
+  });
+}
+
 void OptionParser::SetErrorCallback(const Callback& callback) {
   on_error_ = callback;
 }