Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
ab05df3a
Unverified
Commit
ab05df3a
authored
7 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
another try
parent
b455154c
develop
bon8
coverity_scan
feature/optional
gcc_warning_flags
icpc
issue2228
issue2615
issue2932
issue3232_use_catch
master
release/3.10.2
release/3.10.3
release/3.10.4
release/3.10.5
string_view
string_view2
update_doctest
3.6.1
3.3.0
3.2.0
3.1.2
v3.10.5
v3.10.4
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.9.1
v3.9.0
v3.8.0
v3.7.3
v3.7.2
v3.7.1
v3.7.0
v3.6.1
v3.6.0
v3.5.0
v3.4.0
v3.3.0
v3.2.0
v3.1.2
v3.1.1
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
.travis.yml
.travis.yml
+2
-3
test/CMakeLists.txt
test/CMakeLists.txt
+1
-0
No files found.
.travis.yml
View file @
ab05df3a
...
...
@@ -102,8 +102,7 @@ matrix:
-
coveralls --build-root test --include include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp'
env
:
-
COMPILER=g++-4.9
-
CMAKE_OPTIONS=-DJSON_MultipleHeader=ON
-
CMAKE_OPTIONS_MORE=-DJSON_Coverage=ON
-
CMAKE_OPTIONS=-DJSON_Coverage=ON
# Coverity (only for branch coverity_scan)
...
...
@@ -289,7 +288,7 @@ script:
# compile and execute unit tests
-
mkdir -p build && cd build
-
cmake .. ${CMAKE_OPTIONS}
${CMAKE_OPTIONS_MORE}
-GNinja && cmake --build . --config Release
-
cmake .. ${CMAKE_OPTIONS} -GNinja && cmake --build . --config Release
-
ctest -C Release -V -j
-
cd ..
...
...
This diff is collapsed.
Click to expand it.
test/CMakeLists.txt
View file @
ab05df3a
...
...
@@ -41,6 +41,7 @@ if(JSON_Coverage)
find_program
(
GCOV_BIN NAMES gcov-
${
GCC_VERSION
}
gcov HINTS
${
COMPILER_PATH
}
)
# collect all source files from the chosen include dir
set
(
NLOHMANN_JSON_INCLUDE_BUILD_DIR
"
${
PROJECT_SOURCE_DIR
}
/single_include/"
)
file
(
GLOB_RECURSE SOURCE_FILES
${
NLOHMANN_JSON_INCLUDE_BUILD_DIR
}
*.hpp
)
# add target to collect coverage information and generate HTML file
...
...
This diff is collapsed.
Click to expand it.
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