Browse Source

Merge topic 'msvc-c++23' into release-3.31

d54916d03a MSVC: Revert use of temporary -std:c++23preview flag for C++23

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10470
Brad King 8 months ago
parent
commit
662e8aeea8
1 changed files with 1 additions and 5 deletions
  1. 1 5
      Modules/Compiler/MSVC-CXX.cmake

+ 1 - 5
Modules/Compiler/MSVC-CXX.cmake

@@ -42,11 +42,7 @@ if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0.24215.1 AND
     set(CMAKE_CXX_STANDARD_LATEST 20)
   endif()
 
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.43.34808)
-    set(CMAKE_CXX23_STANDARD_COMPILE_OPTION "-std:c++23preview")
-    set(CMAKE_CXX23_EXTENSION_COMPILE_OPTION "-std:c++23preview")
-    set(CMAKE_CXX_STANDARD_LATEST 23)
-  elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30129)
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30129)
     set(CMAKE_CXX23_STANDARD_COMPILE_OPTION "-std:c++latest")
     set(CMAKE_CXX23_EXTENSION_COMPILE_OPTION "-std:c++latest")
     set(CMAKE_CXX_STANDARD_LATEST 23)