diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-01 16:48:57 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-01 16:48:57 -0400 |
| commit | a88da4ca169a01f45a71513e599e154e0c64b615 (patch) | |
| tree | 007d25755e0d0c9865521c33933a7afea4e877b2 | |
| parent | af5c5a994b90a27e16ef6f2f5044e096269e4217 (diff) | |
SL-16207: Remove CMake cxx_range_for from media_plugin_cef.
Now that we've enabled -std=c++14 for the whole viewer source tree, that CMake
directive is actually a step backwards -- since it introduces -std=gnu++11 on
the compiler command line, after the one we want, which apparently overrides
c++14 with gnu++11 and causes errors with legitimate C++14 constructs.
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index ce6278963d..76d398576c 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -111,9 +111,6 @@ if (DARWIN) LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp" ) - ## turns on C++11 using Cmake - target_compile_features(media_plugin_cef PRIVATE cxx_range_for) - add_custom_command(TARGET media_plugin_cef POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "@executable_path/Chromium Embedded Framework" "@executable_path/../../../../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" |