Skip to content

Commit

Permalink
chore: remove json (#1561)
Browse files Browse the repository at this point in the history
we can't use it currently due to threadsafety issues, so just going to remove it until we actually need it and will re-add it as a vendored file later due to cmake issues pulling in things
  • Loading branch information
aronwk-aaron authored May 2, 2024
1 parent 794b254 commit 07cb19c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ 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 @@ -285,7 +284,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" "nlohmann_json::nlohmann_json")
set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "MariaDB::ConnCpp" "magic_enum")

# Add platform specific common libraries
if(UNIX)
Expand Down
20 changes: 0 additions & 20 deletions cmake/FindJSON.cmake

This file was deleted.

0 comments on commit 07cb19c

Please sign in to comment.