diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-18 13:06:28 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-18 13:06:28 -0800 |
commit | becfbd2b8295e3007fe151cd9b69d0af139040e2 (patch) | |
tree | b45768079da7e69cb4ad45880fa091c0b6f98041 /indra/llcommon | |
parent | 3ac552c5048c13bc2912d25877728a057b195300 (diff) | |
parent | 8b56d0bece83d5f30bc5abb4a4de07fa85585fb8 (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) |