Merge build 32

single_include_projects/SelfTest/ClassTests.cpp

@@ -31,6 +31,7 @@ public:
 METHOD_AS_TEST_CASE( ::TestClass::succeedingCase, "A METHOD_AS_TEST_CASE based test run that succeeds", "[class]" )
 METHOD_AS_TEST_CASE( ::TestClass::failingCase, "A METHOD_AS_TEST_CASE based test run that fails", "[.][class][failing]" )
 
+
 struct Fixture
 {
     Fixture() : m_a( 1 ) {}

single_include_projects/SelfTest/TestMain.cpp

@@ -8,6 +8,8 @@
 
 #if !defined(_WINDLL)
 #define CATCH_CONFIG_MAIN
+#else
+#define CLARA_CONFIG_MAIN
 #endif
 #include "catch.hpp"