From f03d54bfc1c9353b0fadfc204d119de6e073aa28 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Fri, 25 Jun 2021 12:26:31 +0200 Subject: ASM_NASM: Do not generate depfiles with YASM In 3aec26660a (Merge topic 'nasm_add_deps', 2021-03-03) the ASM_NASM language enabled the generation of GCC compatible depfiles for NASM. Unfortunatly, those are not supported by YASM. Fixes: #22341 --- Modules/CMakeASM_NASMInformation.cmake | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake index 27b93ec..dad2750 100644 --- a/Modules/CMakeASM_NASMInformation.cmake +++ b/Modules/CMakeASM_NASMInformation.cmake @@ -38,13 +38,15 @@ if(NOT CMAKE_ASM_NASM_COMPILE_OBJECT) set(CMAKE_ASM_NASM_COMPILE_OBJECT " -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o ") endif() -set(CMAKE_DEPFILE_FLAGS_ASM_NASM "-MD -MT ") - -if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER) - AND CMAKE_GENERATOR MATCHES "Makefiles|WMake") - # dependencies are computed by the compiler itself - set(CMAKE_ASM_NASM_DEPFILE_FORMAT gcc) - set(CMAKE_ASM_NASM_DEPENDS_USE_COMPILER TRUE) +if(CMAKE_ASM_NASM_COMPILER_ID STREQUAL "NASM") + set(CMAKE_DEPFILE_FLAGS_ASM_NASM "-MD -MT ") + + if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER) + AND CMAKE_GENERATOR MATCHES "Makefiles|WMake") + # dependencies are computed by the compiler itself + set(CMAKE_ASM_NASM_DEPFILE_FORMAT gcc) + set(CMAKE_ASM_NASM_DEPENDS_USE_COMPILER TRUE) + endif() endif() # Load the generic ASMInformation file: -- cgit v0.12