diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-05-21 11:48:07 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-05-21 11:48:07 -0700 |
| commit | fa06293a4c637b31094a8c6907982851d4d0b464 (patch) | |
| tree | 4f76114481f4be2678b2818bd292a94acadd892b | |
| parent | 719edddf0498752a0295502d62710823d1a72cc7 (diff) | |
Added call to use_prebuilt_binary for google-breakpad so it actually gets installed by install.py.
| -rw-r--r-- | indra/cmake/GoogleBreakpad.cmake | 11 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake new file mode 100644 index 0000000000..e45518ef56 --- /dev/null +++ b/indra/cmake/GoogleBreakpad.cmake @@ -0,0 +1,11 @@ +# -*- cmake -*- +include(Prebuilt) + +if (STANDALONE) + MESSAGE(FATAL_ERROR "*TODO standalone support for google breakad is unimplemented") + # *TODO - implement this include(FindGoogleBreakpad) +else (STANDALONE) + use_prebuilt_binary(google_breakpad) + set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler) +endif (STANDALONE) + diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 051e198e75..2fcb04321c 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -9,6 +9,7 @@ include(Linking) include(Boost) include(Pth) include(LLSharedLibs) +include(GoogleBreakpad) include(GooglePerfTools) include(Copy3rdPartyLibs) @@ -259,7 +260,7 @@ endif(LLCOMMON_LINK_SHARED) target_link_libraries( llcommon - exception_handler + ${BREAKPAD_EXCEPTION_HANDLER_LIBRARIES} ${APRUTIL_LIBRARIES} ${APR_LIBRARIES} ${EXPAT_LIBRARIES} |