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

This commit is contained in:
Niels Lohmann
2021-01-03 20:15:28 +01:00
7 changed files with 18 additions and 2 deletions
@@ -10,7 +10,9 @@ add_test(NAME cmake_add_subdirectory_build
)
set_tests_properties(cmake_add_subdirectory_configure PROPERTIES
FIXTURES_SETUP cmake_add_subdirectory
LABELS not_reproducible
)
set_tests_properties(cmake_add_subdirectory_build PROPERTIES
FIXTURES_REQUIRED cmake_add_subdirectory
LABELS not_reproducible
)
+2
View File
@@ -12,9 +12,11 @@ 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
)
set_tests_properties(cmake_fetch_content_build PROPERTIES
FIXTURES_REQUIRED cmake_fetch_content
LABELS git_required
LABELS not_reproducible
)
endif()
+2
View File
@@ -11,7 +11,9 @@ add_test(NAME cmake_import_build
)
set_tests_properties(cmake_import_configure PROPERTIES
FIXTURES_SETUP cmake_import
LABELS not_reproducible
)
set_tests_properties(cmake_import_build PROPERTIES
FIXTURES_REQUIRED cmake_import
LABELS not_reproducible
)
+2
View File
@@ -11,7 +11,9 @@ add_test(NAME cmake_import_minver_build
)
set_tests_properties(cmake_import_minver_configure PROPERTIES
FIXTURES_SETUP cmake_import_minver
LABELS not_reproducible
)
set_tests_properties(cmake_import_minver_build PROPERTIES
FIXTURES_REQUIRED cmake_import_minver
LABELS not_reproducible
)
@@ -10,7 +10,9 @@ add_test(NAME cmake_target_include_directories_build
)
set_tests_properties(cmake_target_include_directories_configure PROPERTIES
FIXTURES_SETUP cmake_target_include_directories
LABELS not_reproducible
)
set_tests_properties(cmake_target_include_directories_build PROPERTIES
FIXTURES_REQUIRED cmake_target_include_directories
LABELS not_reproducible
)