Mirrors/tracy
0
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2026-01-18 17:11:26 +01:00
Code Packages Releases Activity

Get nlohmann json via CPM.

Browse Source
This commit is contained in:
Bartosz Taudul
2025-05-20 23:22:40 +02:00
parent eae3c7ef80
commit 580423225e
4 changed files with 11 additions and 24768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/vendor.cmake
View File

@@ -274,3 +274,12 @@ CPMAddPackage(
"${CMAKE_CURRENT_LIST_DIR}/tidy-cmake.patch" "${CMAKE_CURRENT_LIST_DIR}/tidy-cmake.patch"
EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_ALL TRUE
) )
# json
CPMAddPackage(
NAME json
GITHUB_REPOSITORY nlohmann/json
GIT_TAG v3.12.0
EXCLUDE_FROM_ALL TRUE
)

2
import/CMakeLists.txt
View File

@@ -20,7 +20,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake)
add_executable(tracy-import-chrome add_executable(tracy-import-chrome
src/import-chrome.cpp 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 add_executable(tracy-import-fuchsia
src/import-fuchsia.cpp src/import-fuchsia.cpp

3
import/src/import-chrome.cpp
View File

@@ -3,6 +3,7 @@
#endif #endif
#include <fstream> #include <fstream>
#include <nlohmann/json.hpp>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -18,8 +19,6 @@
# define stat64 stat # define stat64 stat
#endif #endif
#include "json.hpp"
#include "../../server/TracyFileWrite.hpp" #include "../../server/TracyFileWrite.hpp"
#include "../../server/TracyMmap.hpp" #include "../../server/TracyMmap.hpp"
#include "../../server/TracyWorker.hpp" #include "../../server/TracyWorker.hpp"

24765
import/src/json.hpp
View File

File diff suppressed because it is too large Load Diff