Allow crashreporter, generate breakpad symbols, and package symbols for 64 bit Linux and Darwin.

Techwolf Lupindo 2014-03-09 19:58:15 -04:00
parent 31397549cc
commit fb219497e9
1 changed files with 2 additions and 2 deletions

View File

@ -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)