diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-06-26 15:08:50 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-06-26 15:08:50 -0400 |
| commit | 8053bceaa0ccd6128536375c21cc3e9e19429efa (patch) | |
| tree | 2ddef23c6bdb51a109ef5c516e1b9bb9c76ceaff /indra/newview | |
| parent | 6f95100f7e33e6cd6e5bc462b1577c3a45fd964c (diff) | |
DRTVWR-476: Pass Obj-C++ switch needed for BugsplatMac on Xcode 10.2.
Diffstat (limited to 'indra/newview')
| -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 766dc5226c..c18b2c9a95 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1381,8 +1381,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) |