Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
a2c074fd
Commit
a2c074fd
authored
Jan 15, 2019
by
onqtam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
this should really fix the XCode 6/7 builds
parent
3340162e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
CMakeLists.txt
test/CMakeLists.txt
+4
-5
doctest_compatibility.h
test/thirdparty/doctest/doctest_compatibility.h
+1
-0
No files found.
test/CMakeLists.txt
View file @
a2c074fd
...
...
@@ -61,13 +61,9 @@ add_library(doctest_main OBJECT
"src/unit.cpp"
)
set_target_properties
(
doctest_main PROPERTIES
COMPILE_DEFINITIONS
"$<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_WARNINGS>"
COMPILE_OPTIONS
"$<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>"
)
target_compile_definitions
(
doctest_main PUBLIC
"$<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_WARNINGS>"
"DOCTEST_THREAD_LOCAL"
"DOCTEST_CONFIG_SUPER_FAST_ASSERTS"
)
target_compile_features
(
doctest_main PUBLIC cxx_std_11
)
target_include_directories
(
doctest_main PRIVATE
"thirdparty/doctest"
)
...
...
@@ -100,6 +96,9 @@ foreach(file ${files})
string
(
REGEX REPLACE
"unit-([^$]+)"
"test-
\\
1"
testcase
${
file_basename
}
)
add_executable
(
${
testcase
}
$<TARGET_OBJECTS:doctest_main>
${
file
}
)
target_compile_definitions
(
${
testcase
}
PRIVATE
DOCTEST_CONFIG_SUPER_FAST_ASSERTS
)
target_compile_options
(
${
testcase
}
PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated;-Wno-float-equal>
...
...
test/thirdparty/doctest/doctest_compatibility.h
View file @
a2c074fd
#ifndef DOCTEST_COMPATIBILITY
#define DOCTEST_COMPATIBILITY
#define DOCTEST_THREAD_LOCAL // enable single-threaded builds on XCode 6/7 - https://github.com/onqtam/doctest/issues/172
#include "doctest.h"
// Catch doesn't require a semicolon after CAPTURE but doctest does
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment