Cmake build: Adapt handling of c++ standards to new Visual C++ 2019

[features.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a123e7c34974938be7eca1d424f1db0e54dc681..618f62ac3246d21fcb3d5c9a8a3d799b7477789a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -657,7 +657,12 @@ else()
        set(library_type STATIC)
 endif()
 
-if(NOT MSVC)
+if(MSVC)
+  if (CXX11_FLAG MATCHES "\\+\\+([0-9]+)")
+    set(CMAKE_CXX_STANDARD ${CMAKE_MATCH_1})
+    message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
+  endif()
+else()
        if(NOT LYX_QUIET)
                set(CMAKE_VERBOSE_MAKEFILE ON)
        endif()