diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-03-17 00:19:38 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-09-08 22:38:46 +0300 |
| commit | 6e200800eddc374419d6e0e42b9ef63813ddf70f (patch) | |
| tree | 66202162c85d4e6985ca93e6efc6721ef918bbc8 /indra/CMakeLists.txt | |
| parent | 9aa5be79d9b5be48d7819c983146b3082be4ab83 (diff) | |
SL-14541 removed breakpad, win_crash_logger
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.h
# indra/win_crash_logger/llcrashloggerwindows.cpp
Cherry picked from DRTVWR-520
Diffstat (limited to 'indra/CMakeLists.txt')
| -rw-r--r-- | indra/CMakeLists.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index db88e44127..ef72edf75d 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -72,6 +72,15 @@ if (LINUX) include(LLAppearanceUtility) add_subdirectory(${LLAPPEARANCEUTILITY_SRC_DIR} ${LLAPPEARANCEUTILITY_BIN_DIR}) endif (INSTALL_PROPRIETARY) + add_dependencies(viewer linux-crash-logger-strip-target) +elseif (DARWIN) + add_subdirectory(${VIEWER_PREFIX}mac_crash_logger) + add_dependencies(viewer mac-crash-logger) +elseif (WINDOWS) + # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake + if (EXISTS ${VIEWER_DIR}win_setup) + add_subdirectory(${VIEWER_DIR}win_setup) + endif (EXISTS ${VIEWER_DIR}win_setup) endif (LINUX) if (WINDOWS) @@ -98,13 +107,6 @@ else (USE_BUGSPLAT) if (LINUX) add_subdirectory(${VIEWER_PREFIX}linux_crash_logger) add_dependencies(viewer linux-crash-logger-strip-target) - elseif (DARWIN) - add_subdirectory(${VIEWER_PREFIX}mac_crash_logger) - add_dependencies(viewer mac-crash-logger) - elseif (WINDOWS) - add_subdirectory(${VIEWER_PREFIX}win_crash_logger) - # add_dependencies(viewer windows-setup windows-crash-logger) - add_dependencies(viewer windows-crash-logger) endif (LINUX) endif (USE_BUGSPLAT) |