diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
commit | 8fe0084108202f307291d5d9be586e5186c2b1de (patch) | |
tree | ade28d7acd7eaf455657260db2b1dc5768e475e4 /indra/cmake/GoogleBreakpad.cmake | |
parent | 9fb96b416f0612882ddcaa658945a5b3f73ff331 (diff) | |
parent | 9a8b1552f0fbff3cde1c8fa5e24924e237008814 (diff) |
Merge. Refresh from viewer-library-refresh after 3.7.13 release.
Diffstat (limited to 'indra/cmake/GoogleBreakpad.cmake')
-rwxr-xr-x | indra/cmake/GoogleBreakpad.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake index 7f9ba4ea8e..829e1ac08a 100755 --- a/indra/cmake/GoogleBreakpad.cmake +++ b/indra/cmake/GoogleBreakpad.cmake @@ -1,10 +1,10 @@ # -*- cmake -*- include(Prebuilt) -if (STANDALONE) +if (USESYSTEMLIBS) set(BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED ON) include(FindGoogleBreakpad) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(google_breakpad) if (DARWIN) set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler) @@ -18,5 +18,5 @@ else (STANDALONE) # yes, this does look dumb, no, it's not incorrect # set(BREAKPAD_INCLUDE_DIRECTORIES "${LIBS_PREBUILT_DIR}/include/google_breakpad" "${LIBS_PREBUILT_DIR}/include/google_breakpad/google_breakpad") -endif (STANDALONE) +endif (USESYSTEMLIBS) |