Skip to content
Permalink
Browse files
Merge pull request #9273 from leoetlino/msvc-preprocessor-fix
CMake: Pass various /Zc flags to MSVC for consistency with Base.props
  • Loading branch information
lioncash committed Nov 21, 2020
2 parents 41b79a6 + f53a7a2 commit d3537e6
Showing 1 changed file with 7 additions and 0 deletions.
@@ -244,6 +244,13 @@ if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
add_compile_options(/volatile:iso)
# Fix non-conformant lambda behavior (constexpr variables shouldn't need capturing)
add_compile_options(/experimental:newLambdaProcessor)
# Fix various other non-conformant behaviors
add_compile_options(/Zc:externConstexpr,lambda,preprocessor)

# Temporarily disable warnings to enable /Zc:preprocessor compatibility with WinSDK headers.
add_compile_options(
/wd5105 # macro expansion producing 'defined' has undefined behavior
)

string(APPEND CMAKE_EXE_LINKER_FLAGS " /NXCOMPAT")
else()

0 comments on commit d3537e6

Please sign in to comment.