j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔨 another try

Browse source
This commit is contained in:
Niels Lohmann 2018-02-09 22:27:08 +01:00
parent b455154cc9
commit ab05df3a48
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

@ -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:
# 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 ..

1
test/CMakeLists.txt
View file

@ -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