diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-18 12:02:04 -0800 | 
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-18 12:02:04 -0800 | 
| commit | 8b56d0bece83d5f30bc5abb4a4de07fa85585fb8 (patch) | |
| tree | 6d9c3e80daece23dd1bf66e5a90ef1b53c18f236 /indra/llcommon | |
| parent | 1875d5e37ba1591ba9b75014a7618f38427f0d2f (diff) | |
| parent | 6b81dfb1398461f008ee7d590e9a14762859e916 (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 2 | 
1 files changed, 2 insertions, 0 deletions
| diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index e41c75846b..416303342a 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -9,6 +9,7 @@ include(Linking)  include(Boost)  include(Pth)  include(LLSharedLibs) +include(GooglePerfTools)  include(Copy3rdPartyLibs)  include_directories( @@ -259,6 +260,7 @@ target_link_libraries(      ${BOOST_PROGRAM_OPTIONS_LIBRARY}      ${BOOST_REGEX_LIBRARY}      ${PTH_LIBRARIES} +    ${GOOGLE_PERFTOOLS_LIBRARIES}      )  add_dependencies(llcommon stage_third_party_libs) | 
