diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-09-25 16:31:33 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-09-25 16:31:33 -0400 |
| commit | b5dbcbd8f80a790cf63fd85d469e78c1337ff436 (patch) | |
| tree | b0cd6b5f26259d688f2aa9dd6ef2131ef6e41b37 /indra | |
| parent | 5d671ff2109656992ac675d7fb70ff48a25dea9a (diff) | |
| parent | 77621dd3fc99f4fb1285a929e0b56b019f6b65c2 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlabinternal/viewer-xcode11
Diffstat (limited to 'indra')
| -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 46fd0f3fd1..2b35d18329 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1377,8 +1377,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) |