diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:46:15 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:46:15 +0200 |
| commit | 4b261a90ae3dead0a1fa843268bae0fda710648b (patch) | |
| tree | 152732b57c90bc23e4893092212a04feff281de5 /indra/newview/CMakeLists.txt | |
| parent | 26732bc576f86fde532e1f9448bd127515f70612 (diff) | |
| parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 534af4d8f6..7fdaa7c5a8 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1383,8 +1383,12 @@ if (DARWIN) PROPERTIES COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # BugsplatMac is a module, imported with @import. That language feature - # demands these switches. - COMPILE_FLAGS "-fmodules -fcxx-modules" + # demands these -f switches. + # Xcode 10.2 requires that Objective-C++ headers declare nullability of + # pointer variables. As of 2019-06-26, the BugsplatMac version we're using + # does not yet do so in its own header files. This -W flag prevents fatal + # warnings. + COMPILE_FLAGS "-fmodules -fcxx-modules -Wno-nullability-completeness" ) find_library(AGL_LIBRARY AGL) |