From fb219497e9aba5ba828851c4dbdeb03f3f13e3f7 Mon Sep 17 00:00:00 2001 From: Techwolf Lupindo Date: Sun, 9 Mar 2014 19:58:15 -0400 Subject: [PATCH] Allow crashreporter, generate breakpad symbols, and package symbols for 64 bit Linux and Darwin. --- indra/newview/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 70acd12768..9e123a1b12 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2464,7 +2464,7 @@ if (PACKAGE) set(VIEWER_COPY_MANIFEST copy_l_viewer_manifest) endif (LINUX) - if( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND NOT ND_BUILD64BIT_ARCH ) + if( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND NOT (ND_BUILD64BIT_ARCH AND WINDOWS) ) if(CMAKE_CFG_INTDIR STREQUAL ".") set(LLBUILD_CONFIG ${CMAKE_BUILD_TYPE}) else(CMAKE_CFG_INTDIR STREQUAL ".") @@ -2488,7 +2488,7 @@ if (PACKAGE) add_custom_target(generate_breakpad_symbols DEPENDS "${VIEWER_SYMBOL_FILE}") add_dependencies(generate_breakpad_symbols "${VIEWER_BINARY_NAME}" "${VIEWER_COPY_MANIFEST}") add_dependencies(package generate_breakpad_symbols) - endif( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND NOT ND_BUILD64BIT_ARCH ) + endif( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND NOT (ND_BUILD64BIT_ARCH AND WINDOWS) ) endif (PACKAGE) if (LL_TESTS)