mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-12 09:08:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmcldeps: Remove unused C and CXX support

Browse Source 
We never set `CMAKE_NINJA_CMCLDEPS_{C,CXX}` anymore.
This commit is contained in:
Benjamin Buch
2023-06-07 11:53:47 +02:00
committed by Brad King
parent 722c801da7
commit 8600fb263b
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmcldeps.cxx
+4 -9
View File
@@ -262,15 +262,10 @@ int main()
srcfilename = srcfilename.substr(pos + 1); srcfilename = srcfilename.substr(pos + 1);
} }
std::string nol = " /nologo "; if (lang == "RC") {
std::string show = " /showIncludes ";
if (lang == "C" || lang == "CXX") {
return process(srcfilename, dfile, objfile, prefix,
binpath + nol + show + rest);
} else if (lang == "RC") {
// "misuse" cl.exe to get headers from .rc files // "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 // 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:");
clrest = replace(clrest, "-fo ", "-out:"); clrest = replace(clrest, "-fo ", "-out:");
@@ -288,8 +283,8 @@ int main()
} }
// extract dependencies with cl.exe // extract dependencies with cl.exe
int exit_code = process(srcfilename, dfile, objfile, prefix, int exit_code =
cl + nol + show + clrest, objdir, true); process(srcfilename, dfile, objfile, prefix, cl + clrest, objdir, true);
if (exit_code != 0) if (exit_code != 0)
return exit_code; return exit_code;