From 689382a722e95decd6a1ec855ce263e42b503f7c Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 2 Nov 2018 09:35:17 +0100 Subject: [PATCH 1/2] Fix EOL Whitespaces & CMake Spelling Fix little leftover EOL whitespaces in `CMakeLists.txt` and a spelling of CMake in README.md --- CMakeLists.txt | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 230cbff8..4a1c188b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,10 +60,10 @@ if (MSVC) set(NLOHMANN_ADD_NATVIS TRUE) set(NLOHMANN_NATVIS_FILE "nlohmann_json.natvis") target_sources( - ${NLOHMANN_JSON_TARGET_NAME} - INTERFACE + ${NLOHMANN_JSON_TARGET_NAME} + INTERFACE $ - $ + $ ) endif() diff --git a/README.md b/README.md index 1154a62e..5cca4da0 100644 --- a/README.md +++ b/README.md @@ -1214,7 +1214,7 @@ The library itself consists of a single header file licensed under the MIT licen - [**Artistic Style**](http://astyle.sourceforge.net) for automatic source code identation - [**Catch**](https://github.com/philsquared/Catch) for the unit tests - [**Clang**](http://clang.llvm.org) for compilation with code sanitizers -- [**Cmake**](https://cmake.org) for build automation +- [**CMake**](https://cmake.org) for build automation - [**Codacity**](https://www.codacy.com) for further [code analysis](https://www.codacy.com/app/nlohmann/json) - [**Coveralls**](https://coveralls.io) to measure [code coverage](https://coveralls.io/github/nlohmann/json) - [**Coverity Scan**](https://scan.coverity.com) for [static analysis](https://scan.coverity.com/projects/nlohmann-json) From a7567bc596ca4fbc416906dc74d11da44af214ab Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 2 Nov 2018 10:42:48 +0100 Subject: [PATCH 2/2] Remove EOL whitespaces in natvis --- nlohmann_json.natvis | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nlohmann_json.natvis b/nlohmann_json.natvis index 63e3f842..55771766 100644 --- a/nlohmann_json.natvis +++ b/nlohmann_json.natvis @@ -19,8 +19,8 @@ - - {second} @@ -28,5 +28,5 @@ second - +