From 92cc5442f1ccf16af944fa564bf6aabe2ee8c995 Mon Sep 17 00:00:00 2001
From: Techwolf Lupindo <none@none>
Date: Wed, 10 Jun 2015 20:34:41 -0400
Subject: [PATCH] Fix linux standalone google breakpad builds. LL code uses
 google_breakpad prefix while google headers don't use a prefix, causing
 "headers not found" errors. Find both paths and set the correct variable used
 in LL code. This patch does not affect builds using prebuilt libs.

---
 indra/cmake/FindGoogleBreakpad.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/cmake/FindGoogleBreakpad.cmake b/indra/cmake/FindGoogleBreakpad.cmake
index 1a0493be5e..e9f67b98c7 100755
--- a/indra/cmake/FindGoogleBreakpad.cmake
+++ b/indra/cmake/FindGoogleBreakpad.cmake
@@ -9,7 +9,10 @@
 # also defined, but not for general use are
 #  BREAKPAD_EXCEPTION_HANDLER_LIBRARY, where to find the Google BreakPad library.
 
+# LL code uses "google_breakpad" path prefix, while google breakpad headers don't use a prefix. Find and add both paths to the correct variable.
 FIND_PATH(BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR google_breakpad/exception_handler.h)
+FIND_PATH(BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIRS exception_handler.h PATH_SUFFIXES google_breakpad)
+SET(BREAKPAD_INCLUDE_DIRECTORIES ${BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR} ${BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIRS})
 
 SET(BREAKPAD_EXCEPTION_HANDLER_NAMES ${BREAKPAD_EXCEPTION_HANDLER_NAMES} breakpad_client)
 FIND_LIBRARY(BREAKPAD_EXCEPTION_HANDLER_LIBRARY
@@ -27,6 +30,7 @@ ENDIF (BREAKPAD_EXCEPTION_HANDLER_LIBRARY AND BREAKPAD_EXCEPTION_HANDLER_INCLUDE
 IF (BREAKPAD_EXCEPTION_HANDLER_FOUND)
    IF (NOT BREAKPAD_EXCEPTION_HANDLER_FIND_QUIETLY)
       MESSAGE(STATUS "Found Google BreakPad: ${BREAKPAD_EXCEPTION_HANDLER_LIBRARIES}")
+      MESSAGE(STATUS "Found Google BreakPad headers in: ${BREAKPAD_INCLUDE_DIRECTORIES}")
    ENDIF (NOT BREAKPAD_EXCEPTION_HANDLER_FIND_QUIETLY)
 ELSE (BREAKPAD_EXCEPTION_HANDLER_FOUND)
    IF (BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED)