Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tracy] update to 0.11.0, cmake build #39976

Merged
merged 1 commit into from
Jul 20, 2024
Merged

[tracy] update to 0.11.0, cmake build #39976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 0 additions & 188 deletions ports/tracy/001-fix-vcxproj-vcpkg.patch
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ports/tracy/002-use-internal-imgui.patch
View file
Open in desktop

This file was deleted.

39 changes: 39 additions & 0 deletions ports/tracy/build-tools.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 358266c0..314e878c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,3 +179,16 @@ if(TRACY_CLIENT_PYTHON)

add_subdirectory(python)
endif()
+
+option(VCPKG_CLI_TOOLS "library" OFF)
+option(VCPKG_GUI_TOOLS "library" OFF)
+if(VCPKG_CLI_TOOLS)
+ add_subdirectory(csvexport)
+ add_subdirectory(capture)
+ add_subdirectory(import-chrome)
+ add_subdirectory(import-fuchsia)
+ add_subdirectory(update)
+endif()
+if(VCPKG_GUI_TOOLS)
+ add_subdirectory(profiler)
+endif()
diff --git a/cmake/server.cmake b/cmake/server.cmake
index c12a3408..0d55cf91 100644
--- a/cmake/server.cmake
+++ b/cmake/server.cmake
@@ -1,3 +1,4 @@
+include_guard(GLOBAL)
set(TRACY_COMMON_DIR ${CMAKE_CURRENT_LIST_DIR}/../public/common)

set(TRACY_COMMON_SOURCES
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index bd53a4db..f8836666 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -1,3 +1,4 @@
+include_guard(GLOBAL)
# Vendor Specific CMake
# The Tracy project keeps most vendor source locally

Loading