summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kuemmel <syntheticpp@gmx.net>2012-06-15 11:07:05 (GMT)
committerPeter Kuemmel <syntheticpp@gmx.net>2012-06-15 11:07:05 (GMT)
commitab245ff3c824797a5a7437330e077a2e6a58593b (patch)
tree0e36dabfab0d64c49bb495e77067a62a441a5032
parentbf58e9adec832608c35119ce7d5334ec750c15d2 (diff)
downloadCMake-ab245ff3c824797a5a7437330e077a2e6a58593b.zip
CMake-ab245ff3c824797a5a7437330e077a2e6a58593b.tar.gz
CMake-ab245ff3c824797a5a7437330e077a2e6a58593b.tar.bz2
Ninja: but cl supports /nologo ...
-rw-r--r--Source/cmcldeps.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index c177178..1d69608 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -683,10 +683,11 @@ int main() {
srcfilename = srcfile.substr(pos + 1);
}
+ std::string nol = " /nologo ";
std::string show = " /showIncludes ";
if (lang == "C" || lang == "CXX") {
return process(srcfilename, dfile, objfile, prefix,
- binpath + show + rest);
+ binpath + nol + show + rest);
} else if (lang == "RC") {
// "misuse" cl.exe to get headers from .rc files
@@ -701,10 +702,10 @@ int main() {
// extract dependencies with cl.exe
process(srcfilename, dfile, objfile,
- prefix, cl + show + clrest, true);
+ prefix, cl + nol + show + clrest, true);
// compile rc file with rc.exe
- return process(srcfilename, "" , objfile, prefix, binpath + nol + rest);
+ return process(srcfilename, "" , objfile, prefix, binpath + rest);
}
usage("Invalid language specified.");