From 3fd8bc04c2d50e23921fa18517a3ea66a38eb09b Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Fri, 10 Feb 2023 11:19:02 -0800
Subject: [PATCH] Upgraded tracy package and enabled for mac with USE_TRACY for
work on mac perfomance SL-18563
```
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110561/960415/tracy-v0.7.8.578230-darwin64-578230.tar.bz2" hash="70f31fa71ecb52bd092da52e27c3ff8c"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110562/960424/tracy-v0.7.8.578230-windows-578230.tar.bz2" hash="1dc33422939adf015db85e96c5a8276e"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110563/960429/tracy-v0.7.8.578230-windows64-578230.tar.bz2" hash="fcc6ecece2ecb65aa36500dfa9461fb3"
```
---
autobuild.xml | 14 +++++++-------
indra/cmake/LLCommon.cmake | 1 +
indra/cmake/Tracy.cmake | 1 +
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 122c4b47e6e..629eecd085b 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2569,9 +2569,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>da7317e4a81609f624f84780f28b07de</string>
+ <string>70f31fa71ecb52bd092da52e27c3ff8c</string>
<key>url</key>
- <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/86972/801630/tracy-v0.7.8.563351-darwin64-563351.tar.bz2</string>
+ <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110561/960415/tracy-v0.7.8.578230-darwin64-578230.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -2581,11 +2581,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>47c696cd2966c5cc3c8ba6115dd1f886</string>
+ <string>1dc33422939adf015db85e96c5a8276e</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/86973/801641/tracy-v0.7.8.563351-windows-563351.tar.bz2</string>
+ <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110562/960424/tracy-v0.7.8.578230-windows-578230.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2595,11 +2595,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>dff3dd1db6a4cb0b73f60a5db3ee0de2</string>
+ <string>fcc6ecece2ecb65aa36500dfa9461fb3</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/100101/882119/tracy-v0.8.1.571983-windows64-571983.tar.bz2</string>
+ <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110563/960429/tracy-v0.7.8.578230-windows64-578230.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -2610,7 +2610,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>source_type</key>
<string>git</string>
<key>version</key>
- <string>v0.7.8.563351</string>
+ <string>v0.7.8.578230</string>
</map>
<key>tut</key>
<map>
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index 528b43c3fcc..0d73270d63c 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -34,6 +34,7 @@ else (LINUX)
${BOOST_CONTEXT_LIBRARY}
${BOOST_THREAD_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
+ ${TRACY_LIBRARY}
)
endif (LINUX)
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index dba57eb9209..2cc9576ea1e 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -17,6 +17,7 @@ if (USE_TRACY)
if (DARWIN)
MESSAGE(STATUS "Including Tracy for Darwin: '${TRACY_INCLUDE_DIR}'")
+ set(TRACY_LIBRARY "tracy")
endif (DARWIN)
if (LINUX)
--
GitLab