diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:59:53 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:59:53 +0200 |
| commit | a661ae4b740a8528440f60b569243cd638bc06bd (patch) | |
| tree | b8f0e677ae2fde8a8b3684c9698ed0281da26fb6 /indra/mac_crash_logger | |
| parent | 35107d1460ee32729cf437377b8d721f135fbd27 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' into DRTVWR-520-apple-notarization
Diffstat (limited to 'indra/mac_crash_logger')
| -rw-r--r-- | indra/mac_crash_logger/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | indra/mac_crash_logger/mac_crash_logger.cpp | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt index 75621d7b75..95637c9a28 100644 --- a/indra/mac_crash_logger/CMakeLists.txt +++ b/indra/mac_crash_logger/CMakeLists.txt @@ -8,7 +8,7 @@ include(LLCoreHttp) include(LLCrashLogger) include(LLMath) include(LLMessage) -include(LLFilesystem) +include(LLVFS) include(LLXML) include(Linking) include(LLSharedLibs) @@ -19,7 +19,7 @@ include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLCRASHLOGGER_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} - ${LLFILESYSTEM_INCLUDE_DIRS} + ${LLVFS_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ) include_directories(SYSTEM @@ -68,10 +68,11 @@ find_library(COCOA_LIBRARY Cocoa) target_link_libraries(mac-crash-logger ${LLCRASHLOGGER_LIBRARIES} - ${LLFILESYSTEM_LIBRARIES} + ${LLVFS_LIBRARIES} ${COCOA_LIBRARIES} ${LLXML_LIBRARIES} ${LLMESSAGE_LIBRARIES} + ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLCOMMON_LIBRARIES} diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 66d8cfa590..54e41a1954 100644 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -27,6 +27,7 @@ #include "linden_common.h" #include "llcrashloggermac.h" #include "indra_constants.h" +#include "llpidlock.h" #include <iostream> |