diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2023-07-12 17:19:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 17:19:56 +0300 |
| commit | 2e713ea59dd498bf7cdf80d4c3348e6334be3dd8 (patch) | |
| tree | a2ec930f732aaed7d7addbb22bb34b15c78d408b | |
| parent | e80f0f331dbfca686e0a80c557e9b1e455c8d167 (diff) | |
| parent | 73d90aa9dd87986dc2ef8f39db346b71c58b181b (diff) | |
Merge pull request #213 from secondlife/rm-cxxstd
SL-18837: Remove C++17 override, given build-variables change.
| -rw-r--r-- | indra/CMakeLists.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 205ce402a0..500ffa3e8b 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -29,15 +29,6 @@ else() set( USE_AUTOBUILD_3P ON ) endif() -# The viewer code base can now be successfully compiled with -std=c++14. But -# turning that on in the generic viewer-build-variables/variables file would -# potentially require tweaking each of our ~50 third-party library builds. -# Until we decide to set -std=c++14 in viewer-build-variables/variables, set -# it locally here: we want to at least prevent inadvertently reintroducing -# viewer code that would fail with C++14. -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - include(Variables) include(BuildVersion) |