tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1--- source/CMakeLists.txt
2+++ source/CMakeLists.txt
3@@ -56,11 +56,6 @@ target_include_directories(${IPFS_API_LIBNAME}
4 )
5
6 # Fetch "JSON for Modern C++"
7-include(FetchContent)
8-message(STATUS "Fetching nlohmann/JSON")
9-# Retrieve Nlohmann JSON
10-FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz)
11-FetchContent_MakeAvailable(json)
12
13 # libcurl requires additional libs only for static Windows builds
14 if(WIN32)
15@@ -71,12 +66,11 @@ set_target_properties(${IPFS_API_LIBNAME} PROPERTIES
16 SOVERSION ${PROJECT_VERSION_MAJOR}
17 VERSION ${PROJECT_VERSION}
18 )
19-target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS} nlohmann_json::nlohmann_json)
20+target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS})
21 if(NOT DISABLE_INSTALL)
22 install(TARGETS ${IPFS_API_LIBNAME} DESTINATION lib)
23 install(FILES include/ipfs/client.h DESTINATION include/ipfs)
24 install(FILES include/ipfs/http/transport.h DESTINATION include/ipfs/http)
25- install(FILES ${json_SOURCE_DIR}/include/nlohmann/json.hpp DESTINATION include/nlohmann)
26 endif()
27 # Tests, use "CTEST_OUTPUT_ON_FAILURE=1 make test" to see output from failed tests