Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the include path in examples as #175 #180

Merged
merged 2 commits into from
Jan 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/all_features/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(all_features)

include(../../scripts/cmake/common.cmake)

include_directories(../../doctest/)
include_directories(../../)

################################################################################
## BUILD ALL EXAMPLE SOURCES INTO A SINGLE BINARY AND EXECUTE TESTS ON EACH FILE
Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/assertion_macros.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>

#include "header.h"

Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/asserts_used_outside_of_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define DOCTEST_CONFIG_SUPER_FAST_ASSERTS // defined so the asserts are crazy fast - both for compilation and execution
#endif

#include "doctest.h"
#include <doctest/doctest.h>

#include "header.h"

Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/concurrency.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>

#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS

Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/doctest_proxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#endif // DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES

// no guard for including the doctest header itself because it should support multiple inclusion
#include "doctest.h"
#include <doctest/doctest.h>

#ifndef MY_PROXY_MACROS
#define MY_PROXY_MACROS
Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/header.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "doctest.h"
#include <doctest/doctest.h>

// helper for throwing exceptions
template <typename T>
Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/logging.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>

#include "header.h"

Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define DOCTEST_CONFIG_IMPLEMENT
#include "doctest.h"
#include <doctest/doctest.h>

#include "header.h"

Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/stringification.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>

#include "header.h"

Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/subcases.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>

#include "header.h"

Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/templated_test_cases.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>

DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion examples/all_features/test_cases_and_suites.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>

#include "header.h"

Expand Down
2 changes: 1 addition & 1 deletion examples/exe_with_static_libs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(exe_with_static_libs)

include(../../scripts/cmake/common.cmake)

include_directories(../../doctest/)
include_directories(../../)

#== create object libraries instead of static libraries
doctest_add_library(lib_1 OBJECT lib_1_src1.cpp lib_1_src2.cpp)
Expand Down
2 changes: 1 addition & 1 deletion examples/exe_with_static_libs/lib_1_src1.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>
DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
#include <cstdio>
DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
Expand Down
2 changes: 1 addition & 1 deletion examples/exe_with_static_libs/lib_1_src2.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>
DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
#include <cstdio>
DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
Expand Down
2 changes: 1 addition & 1 deletion examples/exe_with_static_libs/lib_2_src.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>
DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
#include <cstdio>
DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
Expand Down
2 changes: 1 addition & 1 deletion examples/exe_with_static_libs/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "doctest.h"
#include <doctest/doctest.h>

TEST_CASE("main") { printf("hello from <main.cpp>\n"); }
2 changes: 1 addition & 1 deletion examples/executable_dll_and_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(executable_dll_and_plugin)

include(../../scripts/cmake/common.cmake)

include_directories(../../doctest/)
include_directories(../../)

if(APPLE)
set(CMAKE_MACOSX_RPATH ON)
Expand Down
2 changes: 1 addition & 1 deletion examples/executable_dll_and_plugin/dll.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
#include "doctest.h"
#include <doctest/doctest.h>

DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion examples/executable_dll_and_plugin/implementation.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
#define DOCTEST_CONFIG_IMPLEMENT
#include "doctest.h"
#include <doctest/doctest.h>

DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion examples/executable_dll_and_plugin/implementation_2.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// note that DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL should not be defined here
#include "doctest.h"
#include <doctest/doctest.h>

DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion examples/executable_dll_and_plugin/main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
#include "doctest.h"
#include <doctest/doctest.h>

DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion examples/executable_dll_and_plugin/plugin.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
#include "doctest.h"
#include <doctest/doctest.h>

DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion scripts/coverage_maxout.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "doctest.h"
#include <doctest/doctest.h>

// helper for throwing exceptions
template <typename T>
Expand Down
2 changes: 1 addition & 1 deletion scripts/hello_world.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "doctest.h"
#include <doctest/doctest.h>

int fact(int n) {
return n <= 1 ? n : fact(n - 1) * n;
Expand Down