diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-04 22:00:24 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-04 22:00:24 +0000 |
| commit | e858c172fcdf9aaf736383964c781a0bf347c473 (patch) | |
| tree | 6267e317795d2986c2d4f19b633d89310ad86fc7 | |
| parent | 003020763bc194525be3d3cf18e617c701ea1b2f (diff) | |
Updating to newer build of tcmalloc/google perf tools. Removing X11 library dependencies from headless libraries
| -rw-r--r-- | autobuild.xml | 72 | ||||
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 4 | ||||
| -rw-r--r-- | indra/llwindow/CMakeLists.txt | 1 |
3 files changed, 38 insertions, 39 deletions
diff --git a/autobuild.xml b/autobuild.xml index ebcebfd809..e7631fea03 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -843,6 +843,42 @@ </map> </map> </map> + <key>gperftools</key> + <map> + <key>license</key> + <string>bsd</string> + <key>license_file</key> + <string>LICENSES/gperftools.txt</string> + <key>name</key> + <string>gperftools</string> + <key>platforms</key> + <map> + <key>linux</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>8aedfdcf670348c18a9991ae1b384a61</string> + <key>url</key> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/Linux/installer/gperftools-2.0-linux-20120727.tar.bz2</string> + </map> + <key>name</key> + <string>linux</string> + </map> + <key>windows</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>f62841804acb91e1309603a84f3f0ce8</string> + <key>url</key> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/CYGWIN/installer/gperftools-2.0-windows-20120727.tar.bz2</string> + </map> + <key>name</key> + <string>windows</string> + </map> + </map> + </map> <key>gstreamer</key> <map> <key>license</key> @@ -1781,42 +1817,6 @@ </map> </map> </map> - <key>tcmalloc</key> - <map> - <key>license</key> - <string>bsd</string> - <key>license_file</key> - <string>LICENSES/google-perftools.txt</string> - <key>name</key> - <string>tcmalloc</string> - <key>platforms</key> - <map> - <key>linux</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>dde928cb24d22a267004a8c17669ba65</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226426/arch/Linux/installer/google_perftools-1.7-linux-20110412.tar.bz2</string> - </map> - <key>name</key> - <string>linux</string> - </map> - <key>windows</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>8308f7bd68bb7083655753b7abe7225f</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226287/arch/CYGWIN/installer/google_perftools-1.7-windows-20110411.tar.bz2</string> - </map> - <key>name</key> - <string>windows</string> - </map> - </map> - </map> <key>tut</key> <map> <key>license</key> diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 09501e0406..c2ff095f62 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -10,7 +10,7 @@ if (STANDALONE) else (STANDALONE) if (WINDOWS) if (USE_TCMALLOC) - use_prebuilt_binary(tcmalloc) + use_prebuilt_binary(gperftools) set(TCMALLOC_LIBRARIES debug libtcmalloc_minimal-debug optimized libtcmalloc_minimal) @@ -23,7 +23,7 @@ else (STANDALONE) endif (WINDOWS) if (LINUX) if (USE_TCMALLOC) - use_prebuilt_binary(tcmalloc) + use_prebuilt_binary(gperftools) set(TCMALLOC_LIBRARIES tcmalloc) else (USE_TCMALLOC) diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index be74bbb541..908ed9e2c5 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -85,7 +85,6 @@ if (LINUX) ${LLVFS_LIBRARIES} ${LLWINDOW_HEADLESS_LIBRARIES} ${LLXML_LIBRARIES} - ${UI_LIBRARIES} # for GTK fontconfig # For FCInit and other FC* functions. ) endif (BUILD_HEADLESS) |