diff options
author | Brad King <brad.king@kitware.com> | 2018-11-02 11:56:57 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-02 11:57:06 (GMT) |
commit | a052479a5c75cc4e892fe68002bc0a4d97013a66 (patch) | |
tree | db054a0e64f0abe2bc9292b6f9dccbcdb74d3334 /Source/cmLocalGenerator.cxx | |
parent | 9578c3f0d18a5407a3106a6c487115947d1355e4 (diff) | |
parent | bd9bfc644954a48b1bf7ea18fc260a1231840671 (diff) | |
download | CMake-a052479a5c75cc4e892fe68002bc0a4d97013a66.zip CMake-a052479a5c75cc4e892fe68002bc0a4d97013a66.tar.gz CMake-a052479a5c75cc4e892fe68002bc0a4d97013a66.tar.bz2 |
Merge topic 'msvc-custom-rc-mt'
bd9bfc6449 MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe}
0033676796 CUDA: Enable RC language on Windows
02f566a559 MSVC: Factor out enable_language(RC) call into helper macro
b601bb6f1c CUDA: Find CMAKE_LINKER on Windows
3eebe28ef4 cmLocalNinjaGenerator: Simplify CreateRulePlaceholderExpander
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2424
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index d5a18e6..a065408 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -65,6 +65,7 @@ static const char* ruleReplaceVars[] = { "CMAKE_CURRENT_BINARY_DIR", "CMAKE_RANLIB", "CMAKE_LINKER", + "CMAKE_MT", "CMAKE_CUDA_HOST_COMPILER", "CMAKE_CUDA_HOST_LINK_LAUNCHER", "CMAKE_CL_SHOWINCLUDES_PREFIX" |