Added some missing source files (including all SurrogateCpps) to CMake project.

Fixed up relative include paths to make this work.

projects/CMake/CMakeLists.txt

@@ -7,31 +7,51 @@ get_filename_component(CATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PATH)
 get_filename_component(CATCH_DIR "${CATCH_DIR}" PATH)
 set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
 if(USE_CPP11)
-  ## We can't turn this on by default, since it breaks on travis
+    ## We can't turn this on by default, since it breaks on travis
-  message(STATUS "Enabling C++11")
+    message(STATUS "Enabling C++11")
-  set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
 endif()
 
 # define the sources of the self test
 set(SOURCES
-    ${SELF_TEST_DIR}/ApproxTests.cpp
+        ${SELF_TEST_DIR}/ApproxTests.cpp
-    ${SELF_TEST_DIR}/BDDTests.cpp
+        ${SELF_TEST_DIR}/BDDTests.cpp
-    ${SELF_TEST_DIR}/ClassTests.cpp
+        ${SELF_TEST_DIR}/ClassTests.cpp
-    ${SELF_TEST_DIR}/ConditionTests.cpp
+        ${SELF_TEST_DIR}/ConditionTests.cpp
-    ${SELF_TEST_DIR}/ExceptionTests.cpp
+        ${SELF_TEST_DIR}/ExceptionTests.cpp
-    ${SELF_TEST_DIR}/GeneratorTests.cpp
+        ${SELF_TEST_DIR}/GeneratorTests.cpp
-    ${SELF_TEST_DIR}/MessageTests.cpp
+        ${SELF_TEST_DIR}/MessageTests.cpp
-    ${SELF_TEST_DIR}/MiscTests.cpp
+        ${SELF_TEST_DIR}/MiscTests.cpp
-    ${SELF_TEST_DIR}/PartTrackerTests.cpp
+        ${SELF_TEST_DIR}/PartTrackerTests.cpp
-    ${SELF_TEST_DIR}/TestMain.cpp
+        ${SELF_TEST_DIR}/TestMain.cpp
-    ${SELF_TEST_DIR}/TrickyTests.cpp
+        ${SELF_TEST_DIR}/TrickyTests.cpp
-    ${SELF_TEST_DIR}/VariadicMacrosTests.cpp
+        ${SELF_TEST_DIR}/VariadicMacrosTests.cpp
-    ${SELF_TEST_DIR}/EnumToString.cpp
+        ${SELF_TEST_DIR}/EnumToString.cpp
-    ${SELF_TEST_DIR}/ToStringPair.cpp
+        ${SELF_TEST_DIR}/ToStringPair.cpp
-    ${SELF_TEST_DIR}/ToStringVector.cpp
+        ${SELF_TEST_DIR}/ToStringVector.cpp
-    ${SELF_TEST_DIR}/ToStringWhich.cpp
+        ${SELF_TEST_DIR}/ToStringWhich.cpp
-    ${SELF_TEST_DIR}/ToStringTuple.cpp
+        ${SELF_TEST_DIR}/ToStringTuple.cpp
-)
+        ${SELF_TEST_DIR}/CmdLineTests.cpp
+        ${SELF_TEST_DIR}/TagAliasTests.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_common.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_console_colour.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_debugger.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_capture.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_config.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_exception.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_generators.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_registry_hub.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_reporter.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_runner.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_testcase.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_message.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_option.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_ptr.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_stream.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_streambuf.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_test_spec.cpp
+        ${SELF_TEST_DIR}/SurrogateCpps/catch_xmlwriter.cpp
+        )
 
 # configure the executable
 include_directories(${CATCH_DIR}/include)

projects/SelfTest/CmdLineTests.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "catch.hpp"
-#include "catch_test_spec_parser.hpp"
+#include "internal/catch_test_spec_parser.hpp"
 
 #ifdef __clang__
 #   pragma clang diagnostic ignored "-Wc++98-compat"

projects/SelfTest/SurrogateCpps/catch_common.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_common.h"
+#include "internal/catch_common.h"

projects/SelfTest/SurrogateCpps/catch_console_colour.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_console_colour.hpp"
+#include "internal/catch_console_colour.hpp"

projects/SelfTest/SurrogateCpps/catch_debugger.cpp

@@ -1,2 +1,2 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_debugger.h"
+#include "internal/catch_debugger.h"

projects/SelfTest/SurrogateCpps/catch_interfaces_capture.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_interfaces_capture.h"
+#include "internal/catch_interfaces_capture.h"

projects/SelfTest/SurrogateCpps/catch_interfaces_config.cpp

@@ -1,2 +1,2 @@
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_interfaces_config.h"
+#include "internal/catch_interfaces_config.h"

projects/SelfTest/SurrogateCpps/catch_interfaces_exception.cpp

@@ -1,2 +1,2 @@
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_interfaces_exception.h"
+#include "internal/catch_interfaces_exception.h"

projects/SelfTest/SurrogateCpps/catch_interfaces_generators.cpp

@@ -1 +1 @@
-#include "catch_interfaces_generators.h"
+#include "internal/catch_interfaces_generators.h"

projects/SelfTest/SurrogateCpps/catch_interfaces_registry_hub.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_interfaces_registry_hub.h"
+#include "internal/catch_interfaces_registry_hub.h"

projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp

@@ -1,2 +1,2 @@
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_interfaces_reporter.h"
+#include "internal/catch_interfaces_reporter.h"

projects/SelfTest/SurrogateCpps/catch_interfaces_runner.cpp

@@ -1 +1 @@
-#include "catch_interfaces_runner.h"
+#include "internal/catch_interfaces_runner.h"

projects/SelfTest/SurrogateCpps/catch_interfaces_testcase.cpp

@@ -1,2 +1,2 @@
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_interfaces_testcase.h"
+#include "internal/catch_interfaces_testcase.h"

projects/SelfTest/SurrogateCpps/catch_message.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_message.h"
+#include "internal/catch_message.h"

projects/SelfTest/SurrogateCpps/catch_option.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_option.hpp"
+#include "internal/catch_option.hpp"

projects/SelfTest/SurrogateCpps/catch_ptr.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_ptr.hpp"
+#include "internal/catch_ptr.hpp"

projects/SelfTest/SurrogateCpps/catch_stream.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_stream.h"
+#include "internal/catch_stream.h"

projects/SelfTest/SurrogateCpps/catch_streambuf.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_streambuf.h"
+#include "internal/catch_streambuf.h"

projects/SelfTest/SurrogateCpps/catch_test_spec.cpp

@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_test_spec.hpp"
+#include "internal/catch_test_spec.hpp"

projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp

@@ -1,4 +1,4 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_suppress_warnings.h"
+#include "internal/catch_suppress_warnings.h"
-#include "catch_xmlwriter.hpp"
+#include "internal/catch_xmlwriter.hpp"
-#include "catch_reenable_warnings.h"
+#include "internal/catch_reenable_warnings.h"