Skip to content

Commit 4e5e72f

Browse files
committed
[CMAKE] Silence ML's "Assembling ..." message
1 parent 4c84e19 commit 4e5e72f

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

sdk/cmake/msvc.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,16 @@ else()
205205
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo <OBJECT> <SOURCE>")
206206
endif()
207207

208+
if(MSVC_VERSION GREATER_EQUAL 1936)
209+
set(_quiet_flag "/quiet")
210+
endif()
211+
208212
# We don't put <INCLUDES> <DEFINES> <FLAGS> because this is handled in add_asm_files macro
209213
if (NOT MSVC_IDE)
210214
if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64")
211215
set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> -nologo -o <OBJECT> <SOURCE>")
212216
else()
213-
set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> /nologo /Cp /Fo <OBJECT> /c /Ta <SOURCE>")
217+
set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> /nologo ${_quiet_flag} /Cp /Fo <OBJECT> /c /Ta <SOURCE>")
214218
endif()
215219
endif()
216220

@@ -329,7 +333,7 @@ function(generate_import_lib _libname _dllname _spec_file __version_arg)
329333
if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64")
330334
set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} -nologo -o ${_asm_stubs_file}.obj ${_asm_stubs_file})
331335
else()
332-
set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} /nologo /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file})
336+
set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} /nologo ${_quiet_flag} /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file})
333337
endif()
334338
add_custom_command(
335339
OUTPUT ${_asm_stubs_file}.obj
@@ -447,7 +451,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres
447451
COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_includes} ${_defines} /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file}
448452
DEPENDS ${_asm_file})
449453

450-
set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file})
454+
set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo ${_quiet_flag} /Cp /Fo${_object_file} /c /Ta ${_temp_file})
451455

452456
add_custom_command(
453457
OUTPUT ${_object_file}

subsystems/mvdm/asm16.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ function(add_asm16_bin _target _binary_file _base_address)
112112
COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file}
113113
DEPENDS ${_concatenated_asm_file})
114114

115-
set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file})
115+
if(MSVC_VERSION GREATER_EQUAL 1936)
116+
set(_quiet_flag "/quiet")
117+
endif()
118+
set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo ${_quiet_flag} /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file})
116119

117120
add_custom_command(
118121
OUTPUT ${_object_file}

0 commit comments

Comments
 (0)