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
ab05df3a
Unverified
Commit
ab05df3a
authored
Feb 09, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
another try
parent
b455154c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
.travis.yml
.travis.yml
+2
-3
CMakeLists.txt
test/CMakeLists.txt
+1
-0
No files found.
.travis.yml
View file @
ab05df3a
...
@@ -102,8 +102,7 @@ matrix:
...
@@ -102,8 +102,7 @@ matrix:
-
coveralls --build-root test --include include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp'
-
coveralls --build-root test --include include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp'
env
:
env
:
-
COMPILER=g++-4.9
-
COMPILER=g++-4.9
-
CMAKE_OPTIONS=-DJSON_MultipleHeader=ON
-
CMAKE_OPTIONS=-DJSON_Coverage=ON
-
CMAKE_OPTIONS_MORE=-DJSON_Coverage=ON
# Coverity (only for branch coverity_scan)
# Coverity (only for branch coverity_scan)
...
@@ -289,7 +288,7 @@ script:
...
@@ -289,7 +288,7 @@ script:
# compile and execute unit tests
# compile and execute unit tests
-
mkdir -p build && cd build
-
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
-
ctest -C Release -V -j
-
cd ..
-
cd ..
...
...
test/CMakeLists.txt
View file @
ab05df3a
...
@@ -41,6 +41,7 @@ if(JSON_Coverage)
...
@@ -41,6 +41,7 @@ if(JSON_Coverage)
find_program
(
GCOV_BIN NAMES gcov-
${
GCC_VERSION
}
gcov HINTS
${
COMPILER_PATH
}
)
find_program
(
GCOV_BIN NAMES gcov-
${
GCC_VERSION
}
gcov HINTS
${
COMPILER_PATH
}
)
# collect all source files from the chosen include dir
# 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
)
file
(
GLOB_RECURSE SOURCE_FILES
${
NLOHMANN_JSON_INCLUDE_BUILD_DIR
}
*.hpp
)
# add target to collect coverage information and generate HTML file
# add target to collect coverage information and generate HTML file
...
...
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