summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorMateusz Zych <mte.zych@gmail.com>2018-10-25 00:34:26 (GMT)
committerBrad King <brad.king@kitware.com>2018-10-29 17:40:47 (GMT)
commitbd9bfc644954a48b1bf7ea18fc260a1231840671 (patch)
tree983bc115307da95ae78550b515d26ae324274359 /Source/cmLocalGenerator.cxx
parent0033676796748bd8fe00f3f96d3470405cdb94fe (diff)
downloadCMake-bd9bfc644954a48b1bf7ea18fc260a1231840671.zip
CMake-bd9bfc644954a48b1bf7ea18fc260a1231840671.tar.gz
CMake-bd9bfc644954a48b1bf7ea18fc260a1231840671.tar.bz2
MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe}
CMake commands vs_link_dll and vs_link_exe, performing linking on MSVC, are responsible for calling resource compiler and manifest tool. Before this commit, both of these tools were called directly, with the expectation that they are available in the `PATH`. This has been fixed by respecting CMake variables `CMAKE_RC_COMPILER` and `CMAKE_MT` defining paths to these tools. Fixes: #17804
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7030725..b07d504 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"