From ba3316008afc7852f469f6536df57db8cbce7c49 Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Tue, 28 Jun 2016 17:50:36 +0200
Subject: [PATCH] build: Fixed MacOSX build crashing on launch due to unknown
 command line option

bug id = 103
---
 setup/MacOSX/Info.plist.in                        | 2 +-
 setup/MacOSX/Info_trial.plist.in                  | 2 +-
 src/app/utility/commandline/CommandLineParser.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup/MacOSX/Info.plist.in b/setup/MacOSX/Info.plist.in
index e38dbb53..44ad5cd1 100644
--- a/setup/MacOSX/Info.plist.in
+++ b/setup/MacOSX/Info.plist.in
@@ -27,7 +27,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>@GIT_VERSION_NUMBER@</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
diff --git a/setup/MacOSX/Info_trial.plist.in b/setup/MacOSX/Info_trial.plist.in
index 424170d2..77aebb3b 100644
--- a/setup/MacOSX/Info_trial.plist.in
+++ b/setup/MacOSX/Info_trial.plist.in
@@ -27,7 +27,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>@GIT_VERSION_NUMBER@</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
diff --git a/src/app/utility/commandline/CommandLineParser.cpp b/src/app/utility/commandline/CommandLineParser.cpp
index 7782f238..d373ab52 100644
--- a/src/app/utility/commandline/CommandLineParser.cpp
+++ b/src/app/utility/commandline/CommandLineParser.cpp
@@ -46,7 +46,7 @@ CommandLineParser::CommandLineParser(int argc, char** argv, const std::string& v
 	all.add(desc).add(hidden_desc);
 
 	po::variables_map vm;
-	po::store(po::command_line_parser(argc,argv).options(all).positional(positionalOption).run(), vm);
+	po::store(po::command_line_parser(argc,argv).options(all).positional(positionalOption).allow_unregistered().run(), vm);
 	po::notify(vm);
 
 	if (vm.count("help"))