mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-01 11:22:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmcldeps: Avoid passing /nologo more than once to RC compiler

Browse Source 
`rc /nologo /nologo ...` fails:

    fatal error RC1106: invalid option: -ologo

Fixes: #24974
Inspired-by: Benjamin Buch <benjamin.buch@technoteam.de>
This commit is contained in:
Brad King
2023-06-07 09:58:52 -04:00
parent f694e8d9c8
commit 0e1abf7afa
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmcldeps.cxx
View File

@@ -249,7 +249,16 @@ int main()
if (lang == "RC") {
// "misuse" cl.exe to get headers from .rc files
std::string clrest = " /nologo /showIncludes " + rest;
// Make sure there is at most one /nologo option.
bool const haveNologo = (rest.find("/nologo ") != std::string::npos ||
rest.find("-nologo ") != std::string::npos);
cmSystemTools::ReplaceString(rest, "-nologo ", " ");
cmSystemTools::ReplaceString(rest, "/nologo ", " ");
std::string clrest = rest;
if (haveNologo) {
rest = "/nologo " + rest;
}
// rc /fo X.dir\x.rc.res => cl -FoX.dir\x.rc.res.obj
// The object will not actually be written.
@@ -257,7 +266,7 @@ int main()
cmSystemTools::ReplaceString(clrest, "-fo ", " ");
cmSystemTools::ReplaceString(clrest, objfile, "-Fo" + objfile + ".obj");
cl = "\"" + cl + "\" /P /DRC_INVOKED /TC ";
cl = "\"" + cl + "\" /P /DRC_INVOKED /nologo /showIncludes /TC ";
// call cl in object dir so the .i is generated there
std::string objdir;