mirror of
				https://github.com/DarkflameUniverse/DarkflameServer.git
				synced 2025-10-31 12:41:55 +00:00 
			
		
		
		
	chore: remove json
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
This commit is contained in:
		| @@ -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) | ||||
| @@ -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) | ||||
|   | ||||
| @@ -1,20 +0,0 @@ | ||||
| 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) | ||||
		Reference in New Issue
	
	Block a user
	 Aaron Kimbre
					Aaron Kimbre