diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-22 16:29:58 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-22 16:29:58 +0300 |
commit | 12d68c3f6c9a4f0e9e9bf68f9454cd8145773018 (patch) | |
tree | 579089fd2fb3b10d3f1da911e68071d423ec434c /indra/CMakeLists.txt | |
parent | 13a3c98bb9a76921e907502d2381860fd89c2171 (diff) | |
parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) |
Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.h
Diffstat (limited to 'indra/CMakeLists.txt')
-rw-r--r-- | indra/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 5280dbec45..660c062e18 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -100,10 +100,6 @@ if (USE_BUGSPLAT) endif (BUGSPLAT_DB) else (USE_BUGSPLAT) message(STATUS "Not building with BugSplat") - if (LINUX) - add_subdirectory(${VIEWER_PREFIX}linux_crash_logger) - add_dependencies(viewer linux-crash-logger-strip-target) - endif (LINUX) endif (USE_BUGSPLAT) add_subdirectory(${VIEWER_PREFIX}newview) |