diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-05-24 16:16:31 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-05-24 16:16:31 -0700 |
| commit | 8be11be8e7c7fb48d05bf254828140ef22a6b5b3 (patch) | |
| tree | 107a1a8cd12b1ebf95e992ade4db9e15e9ce5d03 | |
| parent | f24c312f8369fbc6ec4eb0607e7e8ea636aacb82 (diff) | |
| parent | 28bff2cd99ec97d50f07b620f489a9d8745d3add (diff) | |
resolve merge conflict
| -rw-r--r-- | indra/cmake/GoogleBreakpad.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake index b21b733500..0d023b20ec 100644 --- a/indra/cmake/GoogleBreakpad.cmake +++ b/indra/cmake/GoogleBreakpad.cmake @@ -6,12 +6,14 @@ if (STANDALONE) # *TODO - implement this include(FindGoogleBreakpad)
else (STANDALONE)
use_prebuilt_binary(google_breakpad)
- set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler)
- if(WINDOWS)
- list(APPEND BREAKPAD_EXCEPTION_HANDLER_LIBRARIES crash_generation_client common)
- endif(WINDOWS)
+ if (DARWIN)
+ set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler)
+ endif (DARWIN)
if (LINUX)
set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES breakpad_client)
endif (LINUX)
+ if (WINDOWS)
+ set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler crash_generation_client common)
+ endif (WINDOWS)
endif (STANDALONE)
|