summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-02-02 12:23:04 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-02-02 12:24:07 (GMT)
commit457bcbd4f9e4972ed55aebf642770b79fa5e8a58 (patch)
treea8315e9a9467ac1a3c46d976b5c8ad07178f48bc
parent62c5fc80b1a82d677b66134e00cec44ab2e6a466 (diff)
parentdf1693bdfc7bc0afa26b2f8673006186a822c735 (diff)
downloadCMake-457bcbd4f9e4972ed55aebf642770b79fa5e8a58.zip
CMake-457bcbd4f9e4972ed55aebf642770b79fa5e8a58.tar.gz
CMake-457bcbd4f9e4972ed55aebf642770b79fa5e8a58.tar.bz2
Merge topic 'simplify-ccg-converter'
df1693bd cmCustomCommandGenerator: Simplify cmOutputConverter access Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1738
-rw-r--r--Source/cmCustomCommandGenerator.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 0f5119e..136cf39 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -8,7 +8,6 @@
#include "cmGeneratorTarget.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
-#include "cmOutputConverter.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
@@ -167,8 +166,7 @@ void cmCustomCommandGenerator::AppendArguments(unsigned int c,
if (this->OldStyle) {
cmd += escapeForShellOldStyle(arg);
} else {
- cmOutputConverter converter(this->LG->GetStateSnapshot());
- cmd += converter.EscapeForShell(arg, this->MakeVars);
+ cmd += this->LG->EscapeForShell(arg, this->MakeVars);
}
}
}