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 /indra | |
| parent | 003020763bc194525be3d3cf18e617c701ea1b2f (diff) | |
Updating to newer build of tcmalloc/google perf tools. Removing X11 library dependencies from headless libraries
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 4 | ||||
| -rw-r--r-- | indra/llwindow/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 3 deletions
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) |