summaryrefslogtreecommitdiffstats
path: root/Modules/Platform/Windows-MSVC-CXX.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-06-09 16:11:49 (GMT)
committerBrad King <brad.king@kitware.com>2022-06-09 16:24:33 (GMT)
commit7d73e88d3a7490cf1047369da8292a57c0b60bce (patch)
treec2d19d741e502df1f4bf064b28037287085cd35d /Modules/Platform/Windows-MSVC-CXX.cmake
parent84da420a29155e206cef48fc7b05bf818539feb6 (diff)
downloadCMake-7d73e88d3a7490cf1047369da8292a57c0b60bce.zip
CMake-7d73e88d3a7490cf1047369da8292a57c0b60bce.tar.gz
CMake-7d73e88d3a7490cf1047369da8292a57c0b60bce.tar.bz2
MSVC: Revert "Default to -ZI instead of /Zi for x86 and x64"
Revert commit 5fcadc481e (MSVC: Default to -ZI instead of /Zi for x86 and x64, 2022-05-24). The `-ZI` flag is incompatible with the `-GL` flag used for IPO, and so is not an unconditionally better default. Revert the change pending future design of a first-class setting for MSVC debug info format that can be automatically reconciled with IPO settings. That commit introduced policy CMP0138, but we already have later policy numbers used too. Leave placeholder text to avoid policy renumbering. Issue: #23607, #10189
Diffstat (limited to 'Modules/Platform/Windows-MSVC-CXX.cmake')
-rw-r--r--Modules/Platform/Windows-MSVC-CXX.cmake9
1 files changed, 0 insertions, 9 deletions
diff --git a/Modules/Platform/Windows-MSVC-CXX.cmake b/Modules/Platform/Windows-MSVC-CXX.cmake
index ba9a260..6fea617 100644
--- a/Modules/Platform/Windows-MSVC-CXX.cmake
+++ b/Modules/Platform/Windows-MSVC-CXX.cmake
@@ -3,15 +3,6 @@ set(_COMPILE_CXX " /TP")
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
set(_FS_CXX " /FS")
endif()
-
-cmake_policy(GET CMP0138 _cmp0138)
-if(_cmp0138 STREQUAL "NEW")
- if(NOT _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM" AND NOT _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM64")
- set(_ZiOrZI "-ZI")
- endif()
-endif()
-unset(_cmp0138)
-
__windows_compiler_msvc(CXX)
if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)