amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-05-22 06:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics

Browse Source 
 Conflicts:
	include/nlohmann/detail/input/parser.hpp
	single_include/nlohmann/json.hpp
This commit is contained in:
Niels Lohmann
2021-02-07 17:45:09 +01:00
parent 524eea5887 e754ef7087
commit 4917e7c259
9 changed files with 577 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cmake_fetch_content/CMakeLists.txt
+2 -4
View File
@@ -11,12 +11,10 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.11.0")
)
set_tests_properties(cmake_fetch_content_configure PROPERTIES
FIXTURES_SETUP cmake_fetch_content
LABELS git_required
LABELS not_reproducible
LABELS "git_required;not_reproducible"
)
set_tests_properties(cmake_fetch_content_build PROPERTIES
FIXTURES_REQUIRED cmake_fetch_content
LABELS git_required
LABELS not_reproducible
LABELS "git_required;not_reproducible"
)
endif()