From 821100d967e1737d96414a308e3f7cbe0d1abf18 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Sat, 20 Jul 2024 20:35:20 +0200 Subject: [PATCH] [tracy] update to 0.11.0, cmake build (#39976) --- ports/tracy/001-fix-vcxproj-vcpkg.patch | 188 ----------------------- ports/tracy/002-use-internal-imgui.patch | 26 ---- ports/tracy/build-tools.patch | 39 +++++ ports/tracy/portfile.cmake | 111 +++++-------- ports/tracy/vcpkg.json | 13 +- versions/baseline.json | 4 +- versions/t-/tracy.json | 5 + 7 files changed, 92 insertions(+), 294 deletions(-) delete mode 100644 ports/tracy/001-fix-vcxproj-vcpkg.patch delete mode 100644 ports/tracy/002-use-internal-imgui.patch create mode 100644 ports/tracy/build-tools.patch diff --git a/ports/tracy/001-fix-vcxproj-vcpkg.patch b/ports/tracy/001-fix-vcxproj-vcpkg.patch deleted file mode 100644 index fa7a1c9b3e6635..00000000000000 --- a/ports/tracy/001-fix-vcxproj-vcpkg.patch +++ /dev/null @@ -1,188 +0,0 @@ -diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj -index be512f84..e810395a 100644 ---- a/capture/build/win32/capture.vcxproj -+++ b/capture/build/win32/capture.vcxproj -@@ -57,12 +57,11 @@ - TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 - stdcpplatest -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone -+ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone - - -- ws2_32.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Console -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib - - - -@@ -77,14 +76,13 @@ - TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 - stdcpplatest -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone -+ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone - - - true - true -- ws2_32.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Console -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib - - - -diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj -index b4adbf68..8715c883 100644 ---- a/csvexport/build/win32/csvexport.vcxproj -+++ b/csvexport/build/win32/csvexport.vcxproj -@@ -57,12 +57,11 @@ - _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 - stdcpplatest -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone -+ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone - - -- ws2_32.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Console -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib - - - -@@ -77,14 +76,13 @@ - NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 - stdcpplatest -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone -+ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone - - - true - true -- ws2_32.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Console -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib - - - -diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj -index 058a2aa3..86c0990b 100644 ---- a/import-chrome/build/win32/import-chrome.vcxproj -+++ b/import-chrome/build/win32/import-chrome.vcxproj -@@ -57,12 +57,11 @@ - TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 - stdcpplatest -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone -+ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone - - -- ws2_32.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Console -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib - - - -@@ -77,14 +76,13 @@ - TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 - stdcpplatest -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone -+ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone - - - true - true -- ws2_32.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Console -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib - - - -diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj -index 7b5d7cde..9a358b4d 100644 ---- a/profiler/build/win32/Tracy.vcxproj -+++ b/profiler/build/win32/Tracy.vcxproj -@@ -60,7 +60,7 @@ - Disabled - true - _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) -- ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) -+ ..\..\..\imgui;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) - true - false - true -@@ -70,9 +70,8 @@ - Fast - - -- brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Windows -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib - - - true -@@ -86,7 +85,7 @@ - true - true - NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) -- ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) -+ ..\..\..\imgui;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) - true - true - AdvancedVectorExtensions2 -@@ -97,9 +96,8 @@ - - true - true -- brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Windows -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib - - - true -diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj -index 55f0e55e..cbdf8c35 100644 ---- a/update/build/win32/update.vcxproj -+++ b/update/build/win32/update.vcxproj -@@ -57,12 +57,11 @@ - TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 - stdcpplatest -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone -+ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone - - -- ws2_32.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Console -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib - - - -@@ -77,14 +76,13 @@ - TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 - stdcpplatest -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone -+ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone - - - true - true -- ws2_32.lib;capstone.lib;%(AdditionalDependencies) -+ ws2_32.lib;%(AdditionalDependencies) - Console -- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib - - - diff --git a/ports/tracy/002-use-internal-imgui.patch b/ports/tracy/002-use-internal-imgui.patch deleted file mode 100644 index 29f6d9af665055..00000000000000 --- a/ports/tracy/002-use-internal-imgui.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/profiler/build/unix/build.mk b/profiler/build/unix/build.mk -index b134432b..42a9ba0a 100644 ---- a/profiler/build/unix/build.mk -+++ b/profiler/build/unix/build.mk -@@ -1,7 +1,7 @@ - CFLAGS += - CXXFLAGS := $(CFLAGS) -std=c++17 - DEFINES += -DIMGUI_ENABLE_FREETYPE --INCLUDES := $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -I../../../imgui -+INCLUDES := -I../../../imgui $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) - LIBS := $(shell pkg-config --libs freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -lpthread -ldl - - PROJECT := Tracy -diff --git a/profiler/build/unix/legacy.mk b/profiler/build/unix/legacy.mk -index 24765f1a..dc2923c8 100644 ---- a/profiler/build/unix/legacy.mk -+++ b/profiler/build/unix/legacy.mk -@@ -1,7 +1,7 @@ - CFLAGS += - CXXFLAGS := $(CFLAGS) -std=c++17 - DEFINES += -DIMGUI_ENABLE_FREETYPE --INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui -+INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone) - LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl - - PROJECT := Tracy diff --git a/ports/tracy/build-tools.patch b/ports/tracy/build-tools.patch new file mode 100644 index 00000000000000..4c2c42010b0ed1 --- /dev/null +++ b/ports/tracy/build-tools.patch @@ -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 + diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 81b966b9335258..0e52b6476afa22 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -1,105 +1,66 @@ - -# It is possible to run into some issues when profiling when we uses Tracy client as a shared client -# As as safety measure let's build Tracy as a static library for now -# More details on Tracy Discord (e.g. https://discord.com/channels/585214693895962624/585214693895962630/953599951328403506) -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF v0.10 - SHA512 3fc406a42380f6ebe671d560482733f3cdbca16dd7721ac2fce8f1cdefb96ba87701714c2ee8161d65d9e185bc5f9a0fe587a3843eb75f851b10eb895358cb64 + REF "v${VERSION}" + SHA512 8c33a22f43b895f3e00f231f002c8272f72a3d7ce60858d58caf916c2721de478710dbd6ab6b16621a796491303fbce9c2315008b00d7a53d05ee7660b414874 HEAD_REF master PATCHES - 001-fix-vcxproj-vcpkg.patch - 002-use-internal-imgui.patch + build-tools.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES on-demand TRACY_ON_DEMAND fibers TRACY_FIBERS + cli-tools VCPKG_CLI_TOOLS + gui-tools VCPKG_GUI_TOOLS INVERTED_FEATURES crash-handler TRACY_NO_CRASH_HANDLER ) +set(EXTRA_OPTIONS "") +if("cli-tools" IN_LIST FEATURES OR "gui-tools" IN_LIST FEATURES) + vcpkg_find_acquire_program(PKGCONFIG) + list(APPEND EXTRA_OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + -DDOWNLOAD_CAPSTONE=OFF + -DLEGACY=ON + ${FEATURE_OPTIONS} + ${EXTRA_OPTIONS} + MAYBE_UNUSED_VARIABLES + DOWNLOAD_CAPSTONE + LEGACY ) vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy) -function(tracy_tool_install_unix tracy_TOOL tracy_TOOL_NAME) - foreach(buildtype IN ITEMS "debug" "release") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}") - if("${buildtype}" STREQUAL "debug") - set(short_buildtype "-dbg") - set(path_suffix "/debug") - else() - set(short_buildtype "-rel") - set(path_suffix "") - endif() - - file(COPY "${SOURCE_PATH}/${tracy_TOOL}/build/unix" DESTINATION "${SOURCE_PATH}/${tracy_TOOL}/_build") - file(RENAME "${SOURCE_PATH}/${tracy_TOOL}/_build/unix" "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}") - file(REMOVE_RECURSE "${SOURCE_PATH}/${tracy_TOOL}/_build") - - set(path_makefile_dir "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}") - cmake_path(RELATIVE_PATH path_makefile_dir - BASE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}" - OUTPUT_VARIABLE relative_path_makefile_dir) - - set(ENV{LEGACY} 1) - vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) - vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig") - - message(STATUS "Building ${tracy_TOOL_NAME} ${TARGET_TRIPLET}${short_buildtype}") - vcpkg_build_make( - BUILD_TARGET ${buildtype} - SUBPATH ${relative_path_makefile_dir} - LOGFILE_ROOT "build-${tracy_TOOL}" - ) - vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) - - file(INSTALL "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}/${tracy_TOOL_NAME}-${buildtype}" - DESTINATION "${CURRENT_PACKAGES_DIR}${path_suffix}/tools/${PORT}" - RENAME "${tracy_TOOL_NAME}" - USE_SOURCE_PERMISSIONS) - endif() - endforeach() -endfunction() - -function(tracy_tool_install_win32 tracy_TOOL tracy_TOOL_NAME) - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "${tracy_TOOL}/build/win32/${tracy_TOOL_NAME}.sln" - USE_VCPKG_INTEGRATION +function(tracy_copy_tool tool_name) + vcpkg_copy_tools( + TOOL_NAMES "tracy-${tool_name}" + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${tool_name}" + ) + vcpkg_copy_tools( + TOOL_NAMES "tracy-${tool_name}" + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${tool_name}" + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT} ) -endfunction() - -function(tracy_tool_install tracy_TOOL tracy_TOOL_NAME) - if(VCPKG_TARGET_IS_WINDOWS) - tracy_tool_install_win32("${tracy_TOOL}" "${tracy_TOOL_NAME}") - else() - tracy_tool_install_unix("${tracy_TOOL}" "${tracy_TOOL_NAME}") - endif() endfunction() if("cli-tools" IN_LIST FEATURES) - tracy_tool_install(capture capture) - tracy_tool_install(csvexport csvexport) - tracy_tool_install(import-chrome import-chrome) - tracy_tool_install(update update) + tracy_copy_tool(capture) + tracy_copy_tool(csvexport) + tracy_copy_tool(import-chrome) + tracy_copy_tool(import-fuchsia) + tracy_copy_tool(update) endif() if("gui-tools" IN_LIST FEATURES) - tracy_tool_install(profiler Tracy) + tracy_copy_tool(profiler) endif() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy) -vcpkg_fixup_pkgconfig() - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 1c40d36f157856..6614b78f631e28 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tracy", - "version-semver": "0.10.0", - "port-version": 2, + "version": "0.11.0", "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", @@ -25,7 +24,7 @@ ], "features": { "cli-tools": { - "description": "Build Tracy command-line tools: `capture`, `csvexport`, `import-chrome` and `update`", + "description": "Build Tracy command-line tools: `capture`, `csvexport`, `import-chrome`, `import-fuchsia` and `update`", "supports": "!(windows & x86)", "dependencies": [ { @@ -36,6 +35,13 @@ "x86" ] }, + { + "name": "dbus", + "default-features": false, + "platform": "!windows" + }, + "freetype", + "glfw3", { "name": "tbb", "platform": "!windows" @@ -62,6 +68,7 @@ }, { "name": "dbus", + "default-features": false, "platform": "!windows" }, "freetype", diff --git a/versions/baseline.json b/versions/baseline.json index f5fe117a39765e..cb7e673f35e149 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8917,8 +8917,8 @@ "port-version": 4 }, "tracy": { - "baseline": "0.10.0", - "port-version": 2 + "baseline": "0.11.0", + "port-version": 0 }, "transwarp": { "baseline": "2.2.3", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index b3f77617247b4c..73a93e1a22689f 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa1a3312579f656635fbce79edcb1ddb0688186f", + "version": "0.11.0", + "port-version": 0 + }, { "git-tree": "6be8e3b56374cde0053ca09807520831c97f4441", "version-semver": "0.10.0",