summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBenjamin Buch <benjamin.buch@technoteam.de>2023-06-07 09:53:47 (GMT)
committerBrad King <brad.king@kitware.com>2023-06-07 12:16:40 (GMT)
commit8600fb263b71658e2e79c682f6abb991b2139d10 (patch)
treeb15338f302fb8218f4989601dd0fdd7531f6c410 /Source
parent722c801da774a45a3245fd7abe5f87eb5066632f (diff)
downloadCMake-8600fb263b71658e2e79c682f6abb991b2139d10.zip
CMake-8600fb263b71658e2e79c682f6abb991b2139d10.tar.gz
CMake-8600fb263b71658e2e79c682f6abb991b2139d10.tar.bz2
cmcldeps: Remove unused C and CXX support
We never set `CMAKE_NINJA_CMCLDEPS_{C,CXX}` anymore.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmcldeps.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 69eb19e..708c2da 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -262,15 +262,10 @@ int main()
srcfilename = srcfilename.substr(pos + 1);
}
- std::string nol = " /nologo ";
- std::string show = " /showIncludes ";
- if (lang == "C" || lang == "CXX") {
- return process(srcfilename, dfile, objfile, prefix,
- binpath + nol + show + rest);
- } else if (lang == "RC") {
+ if (lang == "RC") {
// "misuse" cl.exe to get headers from .rc files
+ std::string clrest = " /nologo /showIncludes " + rest;
- std::string clrest = rest;
// rc: /fo x.dir\x.rc.res -> cl: /out:x.dir\x.rc.res.dep.obj
clrest = replace(clrest, "/fo ", "/out:");
clrest = replace(clrest, "-fo ", "-out:");
@@ -288,8 +283,8 @@ int main()
}
// extract dependencies with cl.exe
- int exit_code = process(srcfilename, dfile, objfile, prefix,
- cl + nol + show + clrest, objdir, true);
+ int exit_code =
+ process(srcfilename, dfile, objfile, prefix, cl + clrest, objdir, true);
if (exit_code != 0)
return exit_code;