From 30c1a2da8d811bc9217aa723ed9ed430fa4960cd Mon Sep 17 00:00:00 2001 From: Fabian Schiebel Date: Thu, 15 Jun 2023 14:13:20 +0200 Subject: [PATCH 1/2] Bump json + json-schema-validator --- CMakeLists.txt | 17 +++++++---------- external/json | 2 +- external/json-schema-validator | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42e842e312..cec3c62436 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,6 +184,13 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) # Disable clang-tidy for the external projects set(CMAKE_CXX_CLANG_TIDY "") +# Nlohmann JSON + +set(JSON_BuildTests OFF) +set(JSON_Install ON) +add_subdirectory(external/json) +include_directories(SYSTEM external/json/include/) + # We need to work around the behavior of nlohmann_json_schema_validator and nlohmann_json here # The validator needs the json part, but if you include it, the library of nlohmann_json_schema_validator # is not installed, leading to linker error. But just including nlohmann_json is not sufficient, as @@ -195,25 +202,15 @@ set(CMAKE_CXX_CLANG_TIDY "") #Override option of nlohmann_json_schema_validator to not build its tests set(BUILD_TESTS OFF CACHE BOOL "Build json-schema-validator-tests") -# Make nlohmann_json_schema_validator happy by telling it how to find the single include of nlohmann_json -include_directories(SYSTEM external/json/single_include/) - if (PHASAR_IN_TREE) set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS nlohmann_json_schema_validator) endif() -set(nlohmann_json_DIR ${PHASAR_SRC_DIR}/external/json/single_include/) - # Json Schema Validator set(JSON_VALIDATOR_INSTALL ON) add_subdirectory(external/json-schema-validator) include_directories(SYSTEM external/json-schema-validator/src/) -# now we finally add the subdirectory -set(JSON_BuildTests OFF) -set(JSON_Install ON) -add_subdirectory(external/json) - # Googletest if (NOT PHASAR_IN_TREE) add_subdirectory(external/googletest EXCLUDE_FROM_ALL) diff --git a/external/json b/external/json index 4f8fba1406..bc889afb4c 160000 --- a/external/json +++ b/external/json @@ -1 +1 @@ -Subproject commit 4f8fba14066156b73f1189a2b8bd568bde5284c5 +Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d diff --git a/external/json-schema-validator b/external/json-schema-validator index 27fc1d0945..6b17782d6a 160000 --- a/external/json-schema-validator +++ b/external/json-schema-validator @@ -1 +1 @@ -Subproject commit 27fc1d094503623dfe39365ba82581507524545c +Subproject commit 6b17782d6a5d1dee5d2c4fc5d25ffb1123913431 From c76cb432c5fb653948bec401aee8a796385eadf0 Mon Sep 17 00:00:00 2001 From: Fabian Schiebel Date: Thu, 15 Jun 2023 14:24:38 +0200 Subject: [PATCH 2/2] bump gtest --- external/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/googletest b/external/googletest index e2239ee604..b796f7d446 160000 --- a/external/googletest +++ b/external/googletest @@ -1 +1 @@ -Subproject commit e2239ee6043f73722e7aa812a459f54a28552929 +Subproject commit b796f7d44681514f58a683a3a71ff17c94edb0c1