mirror of
https://github.com/wolfpld/tracy.git
synced 2026-01-18 17:11:26 +01:00
Get nlohmann json via CPM.
This commit is contained in:
@@ -274,3 +274,12 @@ CPMAddPackage(
|
||||
"${CMAKE_CURRENT_LIST_DIR}/tidy-cmake.patch"
|
||||
EXCLUDE_FROM_ALL TRUE
|
||||
)
|
||||
|
||||
# json
|
||||
|
||||
CPMAddPackage(
|
||||
NAME json
|
||||
GITHUB_REPOSITORY nlohmann/json
|
||||
GIT_TAG v3.12.0
|
||||
EXCLUDE_FROM_ALL TRUE
|
||||
)
|
||||
|
||||
@@ -20,7 +20,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake)
|
||||
add_executable(tracy-import-chrome
|
||||
src/import-chrome.cpp
|
||||
)
|
||||
target_link_libraries(tracy-import-chrome PRIVATE TracyServer)
|
||||
target_link_libraries(tracy-import-chrome PRIVATE TracyServer nlohmann_json::nlohmann_json)
|
||||
|
||||
add_executable(tracy-import-fuchsia
|
||||
src/import-fuchsia.cpp
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#endif
|
||||
|
||||
#include <fstream>
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -18,8 +19,6 @@
|
||||
# define stat64 stat
|
||||
#endif
|
||||
|
||||
#include "json.hpp"
|
||||
|
||||
#include "../../server/TracyFileWrite.hpp"
|
||||
#include "../../server/TracyMmap.hpp"
|
||||
#include "../../server/TracyWorker.hpp"
|
||||
|
||||
24765
import/src/json.hpp
24765
import/src/json.hpp
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user