From ab05df3a489bc4daff1d1a22f7cc13b766b87598 Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Fri, 9 Feb 2018 22:27:08 +0100
Subject: [PATCH] :hammer: another try

---
 .travis.yml         | 5 ++---
 test/CMakeLists.txt | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 895ddd8d..17ff58bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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 ..
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d53d5c4b..1dfe3400 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -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