diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-02-13 17:04:30 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-02-13 17:04:30 +0300 |
| commit | 6022cd015ffe414b60229ba214dc1e324772e22d (patch) | |
| tree | cdff8a4419dd3d9c208f3a137eb3f8971d9a383c /build_files/cmake/platform/platform_win32.cmake | |
| parent | d1cd3ec9babd8090089a4c7df6b55573adb1aa48 (diff) | |
Revert "Cleanup/MSVC: Enable C++ conformance mode on compiler versions that support it."
It is breaking compilation on some configurations, revert for now while
i see what is wrong.
This reverts commit 9fe469c110940af5d2525158305d5d365bd15276.
Diffstat (limited to 'build_files/cmake/platform/platform_win32.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 5eccc6c66be..653b3a9f508 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -144,19 +144,6 @@ else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj") endif() -# C++ standards conformace (/permissive-) is available on msvc 15.5 (1912) and up -if(MSVC_VERSION GREATER 1911 AND NOT MSVC_CLANG) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /permissive-") - # MSVC 2017 emits a whole lot of warnings (C4199) about two-phase lookup - # in combination with OpenMP, however my current MSVC2019 (16.4) does not. - # From the documentation it is not entirely clear when this got solved, - # so for any compiler versions >= 15.5 and < 16.4 opt in to the old non-conforming behavior. - if(MSVC_VERSION LESS 1924) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Zc:twoPhase-") - endif() -endif() - - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd /ZI") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd /ZI") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") |