From a58eea7419ac9aec6ca08bcfca17ee14bf62e72c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 12 May 2021 22:30:34 -0400
Subject: [PATCH] SL-10297: Revert "Need VS switch /std:c++17 to use
std::string_view."
This reverts commit 28deadab5b37880314a58eff095ae2844a9ebbac.
Going there implies other changes, will take up on another branch.
---
indra/cmake/00-Common.cmake | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 83041d06638..8aea50e02b1 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -66,8 +66,7 @@ if (WINDOWS)
# CP changed to only append the flag for 32bit builds - on 64bit builds,
# locally at least, the build output is spammed with 1000s of 'D9002'
# warnings about this switch being ignored.
- # We need std::string_view, but that's not available without /std:c++17.
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /std:c++17")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
if( ADDRESS_SIZE EQUAL 32 )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")
endif()
--
GitLab