diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-31 13:10:43 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-31 09:10:51 -0400 |
| commit | 720253393c42d64118faf92a56949bfa271a0424 (patch) | |
| tree | 49da0ca07c64a9a2ad0ad56c9f82f1eadfa73c38 /Modules | |
| parent | ec4d70b564f8ac2928cf27aaa10d57ac2a8226bc (diff) | |
| parent | fd28e24947af12f661516dc2b942f2f1a8f586c4 (diff) | |
| download | cmake-720253393c42d64118faf92a56949bfa271a0424.tar.gz | |
Merge topic 'ninja-cmcldeps'
fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3404
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 776b2097e7..7a83859eca 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -421,5 +421,7 @@ macro(__windows_compiler_msvc_enable_rc flags) endif() enable_language(RC) - set(CMAKE_NINJA_CMCLDEPS_RC 1) + if(NOT DEFINED CMAKE_NINJA_CMCLDEPS_RC) + set(CMAKE_NINJA_CMCLDEPS_RC 1) + endif() endmacro() |