зеркало из https://github.com/microsoft/vcpkg.git
[tracy] update to 0.10 (#34544)
This commit is contained in:
Родитель
03ae1a2071
Коммит
051b6d8f8d
|
@ -15,7 +15,7 @@ index 7be39025..ddb49fbc 100644
|
|||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
- <AdditionalDependencies>brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
- <AdditionalDependencies>brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
|
||||
|
@ -35,7 +35,7 @@ index 7be39025..ddb49fbc 100644
|
|||
<Link>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
- <AdditionalDependencies>brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
- <AdditionalDependencies>brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d69f71eb..31429d23 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -143,5 +143,11 @@ install(FILES ${common_includes}
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common)
|
||||
install(EXPORT TracyConfig
|
||||
NAMESPACE Tracy::
|
||||
- FILE TracyConfig.cmake
|
||||
+ FILE TracyTargets.cmake
|
||||
+ DESTINATION share/Tracy)
|
||||
+include(CMakePackageConfigHelpers)
|
||||
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake"
|
||||
+ INSTALL_DESTINATION share/Tracy)
|
||||
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake
|
||||
DESTINATION share/Tracy)
|
||||
diff --git a/Config.cmake.in b/Config.cmake.in
|
||||
new file mode 100644
|
||||
index 00000000..fc913ab3
|
||||
--- /dev/null
|
||||
+++ b/Config.cmake.in
|
||||
@@ -0,0 +1,6 @@
|
||||
+@PACKAGE_INIT@
|
||||
+
|
||||
+include(CMakeFindDependencyMacro)
|
||||
+find_dependency(Threads REQUIRED)
|
||||
+
|
||||
+include("${CMAKE_CURRENT_LIST_DIR}/TracyTargets.cmake")
|
||||
\ No newline at end of file
|
|
@ -7,13 +7,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO wolfpld/tracy
|
||||
REF v0.9.1
|
||||
SHA512 988f492501e5a449ecc89b98d4e8cb6164b65dfe2b5daf17ccc3035f1a477162b77ce7a2cc4c62d7b8a8d530d80f2b439c779319a6bd15b6d37b4a36406d8f4c
|
||||
REF v0.10
|
||||
SHA512 3fc406a42380f6ebe671d560482733f3cdbca16dd7721ac2fce8f1cdefb96ba87701714c2ee8161d65d9e185bc5f9a0fe587a3843eb75f851b10eb895358cb64
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
001-fix-vcxproj-vcpkg.patch
|
||||
003-fix-imgui-path.patch
|
||||
004-fix-missing-threads-dep.patch # https://github.com/wolfpld/tracy/pull/562
|
||||
005-fix-imgui-path-legacy.patch
|
||||
)
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "tracy",
|
||||
"version-semver": "0.9.1",
|
||||
"port-version": 4,
|
||||
"version-semver": "0.10.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",
|
||||
|
|
|
@ -8413,8 +8413,8 @@
|
|||
"port-version": 4
|
||||
},
|
||||
"tracy": {
|
||||
"baseline": "0.9.1",
|
||||
"port-version": 4
|
||||
"baseline": "0.10.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"transwarp": {
|
||||
"baseline": "2.2.2",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2ffcc745825c95eec75922bfdf4433ccedf3981d",
|
||||
"version-semver": "0.10.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "ce810f0e5535da3969128dc5eee0ecf0fcb51162",
|
||||
"version-semver": "0.9.1",
|
||||
|
|
Загрузка…
Ссылка в новой задаче