diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-09 19:34:55 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-09 19:34:55 +0300 |
| commit | b964850141f3a749ff7551ebf871756a02d39085 (patch) | |
| tree | 1396c792c7e85a00e7c8ffda8d8d8a82830479a4 /indra/newview | |
| parent | 4543d5d5ccb6289b870e2c0c80b11f448c97f096 (diff) | |
| parent | 12baf7587822bd6cd15885c45e973d0b7f9dceb4 (diff) | |
Downstream merge from lindenlab/viewer-serval
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 95a916d7cb..6089162190 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) |