diff options
author | Brad King <brad.king@kitware.com> | 2022-06-09 16:11:49 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2022-06-09 16:24:33 (GMT) |
commit | 7d73e88d3a7490cf1047369da8292a57c0b60bce (patch) | |
tree | c2d19d741e502df1f4bf064b28037287085cd35d /Tests/RunCMake | |
parent | 84da420a29155e206cef48fc7b05bf818539feb6 (diff) | |
download | CMake-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 'Tests/RunCMake')
7 files changed, 0 insertions, 37 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 4b00212..5325a3a 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -355,9 +355,6 @@ if(MSVC) add_RunCMake_test(MSVCRuntimeLibrary) add_RunCMake_test(MSVCRuntimeTypeInfo) add_RunCMake_test(MSVCWarningFlags) - if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - add_RunCMake_test(MSVCDebugInformationFormat) - endif() endif() if(XCODE_VERSION) set(ObjectLibrary_ARGS -DXCODE_VERSION=${XCODE_VERSION}) diff --git a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-NEW.cmake b/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-NEW.cmake deleted file mode 100644 index 7dda266..0000000 --- a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-NEW.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0138 NEW) -include(CMP0138-common.cmake) diff --git a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-OLD.cmake b/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-OLD.cmake deleted file mode 100644 index 43e4668..0000000 --- a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-OLD.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0138 OLD) -include(CMP0138-common.cmake) diff --git a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-WARN.cmake b/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-WARN.cmake deleted file mode 100644 index 2a0dd0e..0000000 --- a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-WARN.cmake +++ /dev/null @@ -1,2 +0,0 @@ - -include(CMP0138-common.cmake) diff --git a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-common.cmake b/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-common.cmake deleted file mode 100644 index 89a5ca1..0000000 --- a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0138-common.cmake +++ /dev/null @@ -1,20 +0,0 @@ -foreach(lang C CXX) - enable_language(${lang}) - - cmake_policy(GET CMP0138 cmp0138) - if(cmp0138 STREQUAL "NEW") - if(NOT " ${CMAKE_${lang}_FLAGS_DEBUG} " MATCHES " -ZI ") - message(SEND_ERROR "CMAKE_${lang}_FLAGS_DEBUG does not have '-ZI' under NEW behavior") - endif() - if(NOT " ${CMAKE_${lang}_FLAGS_RELWITHDEBINFO} " MATCHES " -ZI ") - message(SEND_ERROR "CMAKE_${lang}_FLAGS_RELWITHDEBINFO does not have '-ZI' under NEW behavior") - endif() - else() - if(NOT " ${CMAKE_${lang}_FLAGS_DEBUG} " MATCHES " /Zi ") - message(SEND_ERROR "CMAKE_${lang}_FLAGS_DEBUG does not have '/Zi' under OLD behavior") - endif() - if(NOT " ${CMAKE_${lang}_FLAGS_RELWITHDEBINFO} " MATCHES " /Zi ") - message(SEND_ERROR "CMAKE_${lang}_FLAGS_RELWITHDEBINFO does not have '/Zi' under OLD behavior") - endif() - endif() -endforeach() diff --git a/Tests/RunCMake/MSVCDebugInformationFormat/CMakeLists.txt b/Tests/RunCMake/MSVCDebugInformationFormat/CMakeLists.txt deleted file mode 100644 index 5ff8d3e..0000000 --- a/Tests/RunCMake/MSVCDebugInformationFormat/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -cmake_minimum_required(VERSION 3.23) -project(${RunCMake_TEST} NONE) -include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/MSVCDebugInformationFormat/RunCMakeTest.cmake b/Tests/RunCMake/MSVCDebugInformationFormat/RunCMakeTest.cmake deleted file mode 100644 index 7210fcd..0000000 --- a/Tests/RunCMake/MSVCDebugInformationFormat/RunCMakeTest.cmake +++ /dev/null @@ -1,5 +0,0 @@ -include(RunCMake) - -run_cmake(CMP0138-WARN) -run_cmake(CMP0138-OLD) -run_cmake(CMP0138-NEW) |