From 74675dd69c049b45b2b9d74a4a728cf77ef49a34 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Fri, 9 Feb 2018 22:40:52 +0100 Subject: [PATCH] :rewind: back to the original version --- .travis.yml | 2 +- test/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17ff58bf..868ac997 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,7 @@ matrix: before_script: - pip install --user cpp-coveralls after_success: - - coveralls --build-root test --include include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp' + - coveralls --build-root test --include single_include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp' env: - COMPILER=g++-4.9 - CMAKE_OPTIONS=-DJSON_Coverage=ON diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1dfe3400..d53d5c4b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -41,7 +41,6 @@ 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