Update to build 26

projects/SelfTest/CmdLineTests.cpp

@@ -9,7 +9,7 @@
 #pragma clang diagnostic ignored "-Wpadded"
 #endif
 
-#include "internal/clara.h"
+#include "internal/clara.h" // This will does not declare Clara within the Catch namespace
 
 #include "catch.hpp"
 

projects/SelfTest/TestMain.cpp

@@ -18,7 +18,7 @@
 
 template<size_t size>
 void parseIntoConfig( const char * (&argv)[size], Catch::ConfigData& config ) {
-    Clara::CommandLine<Catch::ConfigData> parser = Catch::makeCommandLineParser();
+    Catch::Clara::CommandLine<Catch::ConfigData> parser = Catch::makeCommandLineParser();
     parser.parseInto( size, argv, config );
 }
 

projects/SelfTest/makefile

@@ -1,5 +1,7 @@
 SOURCES =	ApproxTests.cpp \
+      		BDDTests.cpp \
 			ClassTests.cpp \
+			CmdLineTests.cpp \
 			ConditionTests.cpp \
       		ExceptionTests.cpp \
       		GeneratorTests.cpp \
@@ -7,7 +9,6 @@ SOURCES =	ApproxTests.cpp \
       		MiscTests.cpp \
       		TestMain.cpp \
       		TrickyTests.cpp \
-      		BDDTests.cpp \
       		VariadicMacrosTests.cpp
 OBJECTS    = $(patsubst %.cpp, %.o, $(SOURCES))
 CXX = g++