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

@@ -249,11 +249,11 @@ namespace Catch {
stream << "\n" << getTildes() << "\n";
Colour colour( Colour::SecondaryText );
stream << currentTestRunInfo->name
<< " is a Catch v" << libraryVersion.majorVersion << "."
<< libraryVersion.minorVersion << " b"
<< libraryVersion.buildNumber;
if( libraryVersion.branchName != "master" )
stream << " (" << libraryVersion.branchName << ")";
<< " is a Catch v" << libraryVersion::value.majorVersion << "."
<< libraryVersion::value.minorVersion << " b"
<< libraryVersion::value.buildNumber;
if( libraryVersion::value.branchName != "master" )
stream << " (" << libraryVersion::value.branchName << ")";
stream << " host application.\n"
<< "Run with -? for options\n\n";