mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 01:51:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-masm-debug-format' into masm-debug-format

Browse Source
This commit is contained in:
Brad King
2022-12-15 11:55:09 -05:00
parent 26ab669173 a9bd1e34ef
commit f62a0f53bf
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/CMakeASM_MASMInformation.cmake
View File

@@ -16,5 +16,9 @@ set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDL
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug "") set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug "")
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL "") set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL "")
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_Embedded "-Zi")
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_ProgramDatabase "")
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_EditAndContinue "")
include(CMakeASMInformation) include(CMakeASMInformation)
set(ASM_DIALECT) set(ASM_DIALECT)

4
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -3859,6 +3859,10 @@ bool cmVisualStudio10TargetGenerator::ComputeMasmOptions(
this->LocalGenerator, Options::MasmCompiler, gg->GetMasmFlagTable()); this->LocalGenerator, Options::MasmCompiler, gg->GetMasmFlagTable());
Options& masmOptions = *pOptions; Options& masmOptions = *pOptions;
// MSBuild enables debug information by default.
// Disable it explicitly unless a flag parsed below re-enables it.
masmOptions.AddFlag("GenerateDebugInformation", "false");
std::string flags; std::string flags;
this->LocalGenerator->AddLanguageFlags(flags, this->GeneratorTarget, this->LocalGenerator->AddLanguageFlags(flags, this->GeneratorTarget,
cmBuildStep::Compile, "ASM_MASM", cmBuildStep::Compile, "ASM_MASM",

2
Tests/VSMASM/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 3.25) # Enable CMP0141
project(VSMASM C ASM_MASM) project(VSMASM C ASM_MASM)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
add_definitions(-DTESTx64) add_definitions(-DTESTx64)