Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
ITABase
Commits
548db4c6
Commit
548db4c6
authored
Aug 25, 2021
by
Pascal Palenda
Browse files
Add new json library to ITABase
parent
ba3e356d
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
548db4c6
...
...
@@ -61,7 +61,11 @@ endif ()
option
(
ITA_BASE_WITH_JSON_SUPPORT OFF
"Build ITA Base with JSON support"
)
if
(
ITA_BASE_WITH_JSON_SUPPORT
)
add_definitions
(
-DWITH_JSON_SUPPORT
)
target_compile_definitions
(
${
PROJECT_NAME
}
PUBLIC WITH_JSON_SUPPORT
)
target_link_libraries
(
${
PROJECT_NAME
}
PRIVATE nlohmann_json::nlohmann_json
)
endif
()
if
(
ITA_BASE_WITH_OLD_RAVEN_OPS
)
...
...
external_libs/CMakeLists.txt
View file @
548db4c6
...
...
@@ -370,3 +370,10 @@ if (ITA_BASE_WITH_REGULAR_EXPRESSIONS)
)
endif
()
CPMAddPackage
(
NAME nlohmann_json
GITHUB_REPOSITORY nlohmann/json
VERSION 3.10.1
OPTIONS
"JSON_BuildTests OFF"
)
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment