Fix visual studio 2019 build with qt5

florianbecker · florianbecker · commit f0a6d0b22859 · 2021-12-18T19:55:31.000+01:00
diff --git a/cmake/env.cmake b/cmake/env.cmake
@@ -115,6 +115,8 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
     string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   endif()
+
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_SPACED}")
 endif()
 
 # Project modules/variables
diff --git a/cmake/msvc_warnings.cmake b/cmake/msvc_warnings.cmake
@@ -29,6 +29,7 @@
 #
 
 set(WARNING_FLAGS
+  # Visual Studio 2019 Qt 5.15
   # operator: deprecated between enumerations of different types
   /wd5054
 )

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`#`
`30`	`30`
`31`	`31`	`set(WARNING_FLAGS`
	`32`	`+ # Visual Studio 2019 Qt 5.15`
`32`	`33`	`# operator: deprecated between enumerations of different types`
`33`	`34`	`/wd5054`
`34`	`35`	`)`