diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-28 13:06:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-28 13:06:34 (GMT) |
| commit | 1b021a64f8bf4d9544acb18628e3821f61f49e10 (patch) | |
| tree | a6a50b9f9614b5f2c93c5e14ef8059a3539cd1ac /Source/cmNinjaTargetGenerator.cxx | |
| parent | 7287893d411dde3b9afc6a4c8896dd9d15db9e04 (diff) | |
| parent | 15b3f6f0f187ab12c29e437f737356bed13d977b (diff) | |
| download | CMake-1b021a64f8bf4d9544acb18628e3821f61f49e10.zip CMake-1b021a64f8bf4d9544acb18628e3821f61f49e10.tar.gz CMake-1b021a64f8bf4d9544acb18628e3821f61f49e10.tar.bz2 | |
Merge topic 'ninja-no-rsp-for-rc'
15b3f6f0 ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC files
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 954c73e..4d469b2 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -321,7 +321,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang) std::string rspcontent; std::string responseFlag; - if (this->ForceResponseFile()) { + if (lang != "RC" && this->ForceResponseFile()) { rspfile = "$RSP_FILE"; responseFlag = "@" + rspfile; rspcontent = " $DEFINES $INCLUDES $FLAGS"; @@ -603,7 +603,9 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement( this->SetMsvcTargetPdbVariable(vars); - int const commandLineLengthLimit = this->ForceResponseFile() ? -1 : 0; + bool const isRC = (language == "RC"); + int const commandLineLengthLimit = + ((!isRC && this->ForceResponseFile())) ? -1 : 0; std::string const rspfile = objectFileName + ".rsp"; this->GetGlobalGenerator()->WriteBuild( |