Fixed up include paths

This commit is contained in:
Martin Hořeňovský 2019-11-30 12:32:10 +01:00
parent e1a43b5b0f
commit 7c6de33977
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
14 changed files with 53 additions and 53 deletions

View File

@ -19,7 +19,7 @@
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#include "internal/catch_suppress_warnings.h" #include "catch_suppress_warnings.h"
#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) #if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
# define CATCH_IMPL # define CATCH_IMPL
@ -39,7 +39,7 @@
#endif #endif
#if !defined(CATCH_CONFIG_IMPL_ONLY) #if !defined(CATCH_CONFIG_IMPL_ONLY)
#include "internal/catch_platform.h" #include "catch_platform.h"
#ifdef CATCH_IMPL #ifdef CATCH_IMPL
# ifndef CLARA_CONFIG_MAIN # ifndef CLARA_CONFIG_MAIN
@ -48,49 +48,49 @@
# endif # endif
#endif #endif
#include "internal/catch_user_interfaces.h" #include "catch_user_interfaces.h"
#include "internal/catch_tag_alias_autoregistrar.h" #include "catch_tag_alias_autoregistrar.h"
#include "internal/catch_test_registry.h" #include "catch_test_registry.h"
#include "internal/catch_capture.hpp" #include "catch_capture.hpp"
#include "internal/catch_section.h" #include "catch_section.h"
#include "internal/catch_interfaces_exception.h" #include "catch_interfaces_exception.h"
#include "internal/catch_approx.h" #include "catch_approx.h"
#include "internal/catch_compiler_capabilities.h" #include "catch_compiler_capabilities.h"
#include "internal/catch_string_manip.h" #include "catch_string_manip.h"
#ifndef CATCH_CONFIG_DISABLE_MATCHERS #ifndef CATCH_CONFIG_DISABLE_MATCHERS
#include "internal/catch_capture_matchers.h" #include "catch_capture_matchers.h"
#endif #endif
#include "internal/catch_generators.hpp" #include "catch_generators.hpp"
#include "internal/catch_generators_generic.hpp" #include "catch_generators_generic.hpp"
#include "internal/catch_generators_specific.hpp" #include "catch_generators_specific.hpp"
// These files are included here so the single_include script doesn't put them // These files are included here so the single_include script doesn't put them
// in the conditionally compiled sections // in the conditionally compiled sections
#include "internal/catch_test_case_info.h" #include "catch_test_case_info.h"
#include "internal/catch_interfaces_runner.h" #include "catch_interfaces_runner.h"
#ifdef __OBJC__ #ifdef __OBJC__
#include "internal/catch_objc.hpp" #include "catch_objc.hpp"
#endif #endif
// Benchmarking needs the externally-facing parts of reporters to work // Benchmarking needs the externally-facing parts of reporters to work
#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING) #if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
#include "internal/catch_external_interfaces.h" #include "catch_external_interfaces.h"
#endif #endif
#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
#include "internal/benchmark/catch_benchmark.hpp" #include "benchmark/catch_benchmark.hpp"
#endif #endif
#endif // ! CATCH_CONFIG_IMPL_ONLY #endif // ! CATCH_CONFIG_IMPL_ONLY
#ifdef CATCH_IMPL #ifdef CATCH_IMPL
#include "internal/catch_impl.hpp" #include "catch_impl.hpp"
#endif #endif
#ifdef CATCH_CONFIG_MAIN #ifdef CATCH_CONFIG_MAIN
#include "internal/catch_default_main.hpp" #include "catch_default_main.hpp"
#endif #endif
@ -485,6 +485,6 @@ using Catch::Detail::Approx;
#endif // ! CATCH_CONFIG_IMPL_ONLY #endif // ! CATCH_CONFIG_IMPL_ONLY
#include "internal/catch_reenable_warnings.h" #include "catch_reenable_warnings.h"
#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_HPP_INCLUDED

View File

@ -23,7 +23,7 @@
#pragma clang diagnostic ignored "-Wshadow" #pragma clang diagnostic ignored "-Wshadow"
#endif #endif
#include "../external/clara.hpp" #include "external/clara.hpp"
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop

View File

@ -7,14 +7,14 @@
#ifndef TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
#define TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED #define TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
#include "../reporters/catch_reporter_bases.hpp" #include "reporters/catch_reporter_bases.hpp"
#include "catch_console_colour.h" #include "catch_console_colour.h"
#include "catch_reporter_registrars.hpp" #include "catch_reporter_registrars.hpp"
// Allow users to base their work off existing reporters // Allow users to base their work off existing reporters
#include "../reporters/catch_reporter_compact.h" #include "reporters/catch_reporter_compact.h"
#include "../reporters/catch_reporter_console.h" #include "reporters/catch_reporter_console.h"
#include "../reporters/catch_reporter_junit.h" #include "reporters/catch_reporter_junit.h"
#include "../reporters/catch_reporter_xml.h" #include "reporters/catch_reporter_xml.h"
#endif // TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED #endif // TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED

View File

@ -7,7 +7,7 @@
#include "catch_interfaces_reporter.h" #include "catch_interfaces_reporter.h"
#include "catch_console_colour.h" #include "catch_console_colour.h"
#include "../reporters/catch_reporter_listening.h" #include "reporters/catch_reporter_listening.h"
#include "catch_list.h" #include "catch_list.h"
#include "catch_text.h" #include "catch_text.h"

View File

@ -21,7 +21,7 @@
#include "catch_text.h" #include "catch_text.h"
#include "catch_stream.h" #include "catch_stream.h"
#include "catch_windows_h_proxy.h" #include "catch_windows_h_proxy.h"
#include "../reporters/catch_reporter_listening.h" #include "reporters/catch_reporter_listening.h"
#include <cstdlib> #include <cstdlib>
#include <iomanip> #include <iomanip>

View File

@ -6,8 +6,8 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include "../internal/catch_interfaces_reporter.h" #include "../catch_interfaces_reporter.h"
#include "../internal/catch_errno_guard.h" #include "../catch_errno_guard.h"
#include "catch_reporter_bases.hpp" #include "catch_reporter_bases.hpp"
#include <cstring> #include <cstring>

View File

@ -8,8 +8,8 @@
#ifndef TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED #define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED
#include "../internal/catch_enforce.h" #include "../catch_enforce.h"
#include "../internal/catch_interfaces_reporter.h" #include "../catch_interfaces_reporter.h"
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>

View File

@ -7,8 +7,8 @@
#include "catch_reporter_compact.h" #include "catch_reporter_compact.h"
#include "../internal/catch_reporter_registrars.hpp" #include "../catch_reporter_registrars.hpp"
#include "../internal/catch_console_colour.h" #include "../catch_console_colour.h"
namespace { namespace {

View File

@ -8,11 +8,11 @@
#include "catch_reporter_console.h" #include "catch_reporter_console.h"
#include "../internal/catch_reporter_registrars.hpp" #include "../catch_reporter_registrars.hpp"
#include "../internal/catch_console_colour.h" #include "../catch_console_colour.h"
#include "../internal/catch_version.h" #include "../catch_version.h"
#include "../internal/catch_text.h" #include "../catch_text.h"
#include "../internal/catch_stringref.h" #include "../catch_stringref.h"
#include <cfloat> #include <cfloat>
#include <cstdio> #include <cstdio>

View File

@ -10,9 +10,9 @@
#include "catch_reporter_junit.h" #include "catch_reporter_junit.h"
#include "../internal/catch_tostring.h" #include "../catch_tostring.h"
#include "../internal/catch_reporter_registrars.hpp" #include "../catch_reporter_registrars.hpp"
#include "../internal/catch_text.h" #include "../catch_text.h"
#include <cassert> #include <cassert>
#include <sstream> #include <sstream>

View File

@ -9,8 +9,8 @@
#include "catch_reporter_bases.hpp" #include "catch_reporter_bases.hpp"
#include "../internal/catch_xmlwriter.h" #include "../catch_xmlwriter.h"
#include "../internal/catch_timer.h" #include "../catch_timer.h"
namespace Catch { namespace Catch {

View File

@ -7,7 +7,7 @@
#ifndef TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED
#define TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED #define TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED
#include "../internal/catch_interfaces_reporter.h" #include "../catch_interfaces_reporter.h"
namespace Catch { namespace Catch {

View File

@ -8,9 +8,9 @@
#include "catch_reporter_xml.h" #include "catch_reporter_xml.h"
#include "../internal/catch_capture.hpp" #include "../catch_capture.hpp"
#include "../internal/catch_reporter_registrars.hpp" #include "../catch_reporter_registrars.hpp"
#include "../internal/catch_list.h" #include "../catch_list.h"
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)

View File

@ -9,8 +9,8 @@
#include "catch_reporter_bases.hpp" #include "catch_reporter_bases.hpp"
#include "../internal/catch_xmlwriter.h" #include "../catch_xmlwriter.h"
#include "../internal/catch_timer.h" #include "../catch_timer.h"
namespace Catch { namespace Catch {