diff options
author | Brad King <brad.king@kitware.com> | 2009-09-30 14:12:54 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-09-30 14:12:54 (GMT) |
commit | 67530409a91156b06b3f8076bbd2e96969319fd4 (patch) | |
tree | 17a28cc94e3a369b2b7332fde6f5851b5387161f /Source/cmMakefileTargetGenerator.cxx | |
parent | b5bc1d9f7423a7fc2ae59a27c02f1e742e07efc4 (diff) | |
download | CMake-67530409a91156b06b3f8076bbd2e96969319fd4.zip CMake-67530409a91156b06b3f8076bbd2e96969319fd4.tar.gz CMake-67530409a91156b06b3f8076bbd2e96969319fd4.tar.bz2 |
Fix module definition file reference for VS6 NMake
When building through NMake with VS 6, the module definition file must
be passed without spaces in the path. This is because 'cl -link' does
not escape the spaces when passing the value on to the linker.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 94e0833..edfae87 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1755,10 +1755,10 @@ void cmMakefileTargetGenerator::AddModuleDefinitionFlag(std::string& flags) return; } - // Append the flag and value. + // Append the flag and value. Use ConvertToLinkReference to help + // vs6's "cl -link" pass it to the linker. std::string flag = defFileFlag; - flag += this->Convert(this->ModuleDefinitionFile.c_str(), - cmLocalGenerator::START_OUTPUT, - cmLocalGenerator::SHELL); + flag += (this->LocalGenerator->ConvertToLinkReference( + this->ModuleDefinitionFile.c_str())); this->LocalGenerator->AppendFlags(flags, flag.c_str()); } |