diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-09 19:28:30 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-09 19:28:30 +0300 |
| commit | fe490d52b45679edf5740fa46fc3c76d608bfc95 (patch) | |
| tree | 9901be5f75c9be0d3697afda654a2b59a699e7d7 /indra/newview/CMakeLists.txt | |
| parent | 3feba8be0d91a28851d6e606c917508924bc549f (diff) | |
| parent | 52c9f57819fe541980d0f2668afa31376f1bb29e (diff) | |
Merged in lindenlab/viewer-xcode11
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 b8789da66b..694e89ab99 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) |