Revert "Replace the full nlohmann_json repo with a fetch_content variant. (#279)"
This reverts commit 540a7e3dd4.
This commit is contained in:
parent
8912ad3490
commit
6db2ee1f5a
@ -84,7 +84,7 @@ set(fetch_packages "")
|
|||||||
# TODO: Remove when bumping cmake >= 3.24
|
# TODO: Remove when bumping cmake >= 3.24
|
||||||
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
|
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
|
||||||
FetchContent_Declare(nlohmann_json
|
FetchContent_Declare(nlohmann_json
|
||||||
GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent
|
GIT_REPOSITORY https://github.com/nlohmann/json
|
||||||
GIT_TAG ${JSON_FETCH_VERSION}
|
GIT_TAG ${JSON_FETCH_VERSION}
|
||||||
FIND_PACKAGE_ARGS
|
FIND_PACKAGE_ARGS
|
||||||
)
|
)
|
||||||
@ -95,7 +95,7 @@ else ()
|
|||||||
if (NOT nlohmann_json_FOUND)
|
if (NOT nlohmann_json_FOUND)
|
||||||
# If failed fetch the desired version
|
# If failed fetch the desired version
|
||||||
FetchContent_Declare(nlohmann_json
|
FetchContent_Declare(nlohmann_json
|
||||||
GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent
|
GIT_REPOSITORY https://github.com/nlohmann/json
|
||||||
GIT_TAG ${JSON_FETCH_VERSION}
|
GIT_TAG ${JSON_FETCH_VERSION}
|
||||||
)
|
)
|
||||||
list(APPEND fetch_packages nlohmann_json)
|
list(APPEND fetch_packages nlohmann_json)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user