Skip to content

Remove CMake nlohmann module #1042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7 commits merged into from
Dec 3, 2020
Merged

Remove CMake nlohmann module #1042

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
accd887
version update
vhvb1989 Dec 1, 2020
e9b4813
Merge branch 'master' of github.com:Azure/azure-sdk-for-cpp into fix-…
vhvb1989 Dec 1, 2020
e7f11f7
remove add_nlohmann cmake module. Expect the lib to be installed alre…
vhvb1989 Dec 1, 2020
ef6e23e
remove extra find package
vhvb1989 Dec 1, 2020
6172761
fix for release artifacts
vhvb1989 Dec 1, 2020
6fb8386
Merge branch 'master' of github.com:Azure/azure-sdk-for-cpp into fix-…
vhvb1989 Dec 3, 2020
ab5750d
commets for double find_package
vhvb1989 Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake-modules/add_nlohmann_json.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@

# Storage requires 3.6.0 version for using `contains` feature
Comment thread
vhvb1989 marked this conversation as resolved.
Outdated
# Using QUIET to avoid warning message if lib is not found
find_package(nlohmann_json 3.6.0 EXACT QUIET)
find_package(nlohmann_json 3.6.0 QUIET)
Comment thread
vhvb1989 marked this conversation as resolved.
Outdated
if (NOT nlohmann_json_FOUND)

include(FetchContent)

# release code only. This save us from getting the entire nlohmann source code.
FetchContent_Declare(json
GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent
GIT_TAG v3.8.0)
GIT_TAG v3.6.0)
Comment thread
vhvb1989 marked this conversation as resolved.
Outdated

FetchContent_GetProperties(json)
if (NOT json_POPULATED)
Expand Down