Skip to content

Commit

Permalink
feat: add nlohmann/json lib (#1552)
Browse files Browse the repository at this point in the history
* feat: add nlohmann/json lib

* remove build test off
  • Loading branch information
aronwk-aaron authored Apr 25, 2024
1 parent 0367c67 commit 3801a97
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

find_package(MariaDB)
find_package(JSON)

# Create a /resServer directory
make_directory(${CMAKE_BINARY_DIR}/resServer)
Expand Down Expand Up @@ -284,7 +285,7 @@ add_subdirectory(dPhysics)
add_subdirectory(dServer)

# Create a list of common libraries shared between all binaries
set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "MariaDB::ConnCpp" "magic_enum")
set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "MariaDB::ConnCpp" "magic_enum" "nlohmann_json::nlohmann_json")

# Add platform specific common libraries
if(UNIX)
Expand Down
20 changes: 20 additions & 0 deletions cmake/FindJSON.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
include(FetchContent)

message(STATUS "Fetching json...")

FetchContent_Declare(
json
GIT_REPOSITORY https://github.com/nlohmann/json
GIT_TAG v3.11.3
)

FetchContent_GetProperties(json)
if(NOT json_POPULATED)
FetchContent_Populate(json)
add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()

FetchContent_MakeAvailable(json)

message(STATUS "json fetched and is now ready.")
set(JSON_FOUND TRUE)

0 comments on commit 3801a97

Please sign in to comment.