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
3340162e
Commit
3340162e
authored
Jan 15, 2019
by
onqtam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing osx builds - had forgotten to define this for the object file where the…
fixing osx builds - had forgotten to define this for the object file where the test runner is compiled
parent
2f44ac1d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
CMakeLists.txt
test/CMakeLists.txt
+5
-5
No files found.
test/CMakeLists.txt
View file @
3340162e
...
...
@@ -61,9 +61,13 @@ 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"
)
...
...
@@ -96,10 +100,6 @@ 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
DOCTEST_THREAD_LOCAL
)
target_compile_options
(
${
testcase
}
PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated;-Wno-float-equal>
...
...
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