diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-28 13:18:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-28 13:19:06 (GMT) |
| commit | 5430379ee60d5f5417f035142fab59f991460131 (patch) | |
| tree | b5da8498431407ef03c424e42916b18bfc65be74 | |
| parent | 4a0e68266b74479275ca62aca258ca876bc15fc4 (diff) | |
| parent | f03d54bfc1c9353b0fadfc204d119de6e073aa28 (diff) | |
| download | CMake-5430379ee60d5f5417f035142fab59f991460131.zip CMake-5430379ee60d5f5417f035142fab59f991460131.tar.gz CMake-5430379ee60d5f5417f035142fab59f991460131.tar.bz2 | |
Merge topic 'yasm-no-deps' into release-3.21
f03d54bfc1 ASM_NASM: Do not generate depfiles with YASM
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6265
| -rw-r--r-- | Modules/CMakeASM_NASMInformation.cmake | 16 |
1 files 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 "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>") endif() -set(CMAKE_DEPFILE_FLAGS_ASM_NASM "-MD <DEP_FILE> -MT <DEP_TARGET>") - -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 <DEP_FILE> -MT <DEP_TARGET>") + + 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: |