summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2021-05-12 17:08:15 -0400
committerNat Goodspeed <nat@lindenlab.com>2021-05-13 11:40:05 -0400
commit060194a9f88c93d1faf2179178b92e94c73a4ca1 (patch)
tree524306d622aefa5ec8cf8b899950f278c2a3f5d9
parent26fb5d7af70f20c9a125575e1d93f7ff4bcd4f3c (diff)
SL-10297: Need VS switch /std:c++17 to use std::string_view.
(cherry picked from commit 28deadab5b37880314a58eff095ae2844a9ebbac)
-rw-r--r--indra/cmake/00-Common.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 4b7b54179c..0da530c6a2 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -66,7 +66,8 @@ 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.
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+ # 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")
if( ADDRESS_SIZE EQUAL 32 )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")
endif()