diff options
author | Erik Kundiman <erik@megapahit.org> | 2023-12-15 18:28:43 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2023-12-15 18:28:43 +0800 |
commit | 91b49c8bfa061f3d3b8601d5398b1889a9e31850 (patch) | |
tree | 98adc151491a2bee51a70cf7dd37de21d4f32bb3 /indra/CMakeLists.txt | |
parent | 0cce0b8149e049161ab17f1c608ded2d6cc12b0e (diff) | |
parent | a80e3fe4191aee87c566937953d52fa6498b7f32 (diff) |
Merge tag '7.1.1-release'
source for viewer 7.1.1.7039128750
Diffstat (limited to 'indra/CMakeLists.txt')
-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 1b13ae4843..154d83a640 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -33,15 +33,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) |