summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorJennifer Leech <jenn@lindenlab.com>2011-02-28 23:47:48 -0800
committerJennifer Leech <jenn@lindenlab.com>2011-02-28 23:47:48 -0800
commita7e2f1eafd303dad844c36ec77bb6a98fd6ee38c (patch)
tree72b1c914d26050bda26cc629c8a72c6f62d03a7b /indra
parentd9a47b33954010bbb1d52491940004368363641b (diff)
Take out symbol generation for slplugin.exe since this step currently fails, need to debug, but don't want it to be a blocker. This is expected to get TeamCity runs passing on Windows.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 1f07af0608..55de2c8d20 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1841,7 +1841,9 @@ if (PACKAGE)
if (WINDOWS)
set(VIEWER_DIST_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-windows.tar.bz2")
- set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX} slplugin.exe")
+ # slplugin.exe failing symbols dump - need to debug, might have to do with updated version of google breakpad
+ # set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX} slplugin.exe")
+ set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
set(VIEWER_LIB_GLOB "*${CMAKE_SHARED_MODULE_SUFFIX}")
set(VIEWER_COPY_MANIFEST copy_w_viewer_manifest)
endif (WINDOWS)