mirror of https://github.com/catchorg/Catch2.git
Added some missing source files (including all SurrogateCpps) to CMake project.
Fixed up relative include paths to make this work.
This commit is contained in:
parent
e27c4ee042
commit
30cebd6177
|
@ -31,7 +31,27 @@ set(SOURCES
|
||||||
${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
|
# configure the executable
|
||||||
include_directories(${CATCH_DIR}/include)
|
include_directories(${CATCH_DIR}/include)
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "catch.hpp"
|
#include "catch.hpp"
|
||||||
#include "catch_test_spec_parser.hpp"
|
#include "internal/catch_test_spec_parser.hpp"
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
# pragma clang diagnostic ignored "-Wc++98-compat"
|
# pragma clang diagnostic ignored "-Wc++98-compat"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#include "catch_interfaces_generators.h"
|
#include "internal/catch_interfaces_generators.h"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#include "catch_interfaces_runner.h"
|
#include "internal/catch_interfaces_runner.h"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
// 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"
|
||||||
|
|
Loading…
Reference in New Issue