Skip to content

Commit 0605f7b

Browse files
MMoryfabianbs96
andauthored
Bump dependencies (#627)
* Bump json + json-schema-validator * bump gtest --------- Co-authored-by: Fabian Schiebel <fabian.schiebel@iem.fraunhofer.de> Co-authored-by: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
1 parent 6d1ef70 commit 0605f7b

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

CMakeLists.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,13 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
184184
# Disable clang-tidy for the external projects
185185
set(CMAKE_CXX_CLANG_TIDY "")
186186

187+
# Nlohmann JSON
188+
189+
set(JSON_BuildTests OFF)
190+
set(JSON_Install ON)
191+
add_subdirectory(external/json)
192+
include_directories(SYSTEM external/json/include/)
193+
187194
# We need to work around the behavior of nlohmann_json_schema_validator and nlohmann_json here
188195
# The validator needs the json part, but if you include it, the library of nlohmann_json_schema_validator
189196
# 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 "")
195202
#Override option of nlohmann_json_schema_validator to not build its tests
196203
set(BUILD_TESTS OFF CACHE BOOL "Build json-schema-validator-tests")
197204

198-
# Make nlohmann_json_schema_validator happy by telling it how to find the single include of nlohmann_json
199-
include_directories(SYSTEM external/json/single_include/)
200-
201205
if (PHASAR_IN_TREE)
202206
set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS nlohmann_json_schema_validator)
203207
endif()
204208

205-
set(nlohmann_json_DIR ${PHASAR_SRC_DIR}/external/json/single_include/)
206-
207209
# Json Schema Validator
208210
set(JSON_VALIDATOR_INSTALL ON)
209211
add_subdirectory(external/json-schema-validator)
210212
include_directories(SYSTEM external/json-schema-validator/src/)
211213

212-
# now we finally add the subdirectory
213-
set(JSON_BuildTests OFF)
214-
set(JSON_Install ON)
215-
add_subdirectory(external/json)
216-
217214
# Googletest
218215
if (NOT PHASAR_IN_TREE)
219216
add_subdirectory(external/googletest EXCLUDE_FROM_ALL)

external/googletest

Submodule googletest updated 237 files

external/json

Submodule json updated 1123 files

external/json-schema-validator

0 commit comments

Comments
 (0)