Catch VS integration Part 2 - modify version, allow multiple includes

This commit is contained in:
Malcolm Noyes
2013-11-14 19:49:49 +00:00
parent e9a2230ad8
commit 73f7f0ad1b
18 changed files with 145 additions and 75 deletions

View File

@@ -129,11 +129,11 @@ namespace Catch {
}
void showHelp( std::string const& processName ) {
std::cout << "\nCatch v" << libraryVersion.majorVersion << "."
<< libraryVersion.minorVersion << " build "
<< libraryVersion.buildNumber;
if( libraryVersion.branchName != "master" )
std::cout << " (" << libraryVersion.branchName << " branch)";
std::cout << "\nCatch v" << libraryVersion::value.majorVersion << "."
<< libraryVersion::value.minorVersion << " build "
<< libraryVersion::value.buildNumber;
if( libraryVersion::value.branchName != "master" )
std::cout << " (" << libraryVersion::value.branchName << " branch)";
std::cout << "\n";
m_cli.usage( std::cout, processName );