summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2002-08-28 18:33:12 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2002-08-28 18:33:12 (GMT)
commit6046060714cf1c9098a843e65151f3ff27a40a7d (patch)
tree6f49e545b8b915be935bb519a74535da47d8ab03 /Source
parent6f310818e1bbcfd7a8f0b8951052a45671d3b18c (diff)
downloadCMake-6046060714cf1c9098a843e65151f3ff27a40a7d.zip
CMake-6046060714cf1c9098a843e65151f3ff27a40a7d.tar.gz
CMake-6046060714cf1c9098a843e65151f3ff27a40a7d.tar.bz2
ENH: add include paths to rc program for resource generation
Diffstat (limited to 'Source')
-rw-r--r--Source/cmBorlandMakefileGenerator.cxx2
-rw-r--r--Source/cmMSDotNETGenerator.cxx8
-rw-r--r--Source/cmNMakeMakefileGenerator.cxx2
3 files changed, 10 insertions, 2 deletions
diff --git a/Source/cmBorlandMakefileGenerator.cxx b/Source/cmBorlandMakefileGenerator.cxx
index 680e534..e467cdd 100644
--- a/Source/cmBorlandMakefileGenerator.cxx
+++ b/Source/cmBorlandMakefileGenerator.cxx
@@ -200,7 +200,7 @@ OutputBuildObjectFromSource(std::ostream& fout,
}
else if (ext == "rc")
{
- compileCommand = "$(RC) -o\"";
+ compileCommand = "$(RC) $(INCLUDE_FLAGS) -o\"";
compileCommand += objectFile;
compileCommand += "\" ";
compileCommand +=
diff --git a/Source/cmMSDotNETGenerator.cxx b/Source/cmMSDotNETGenerator.cxx
index c4b3862..804eaa1 100644
--- a/Source/cmMSDotNETGenerator.cxx
+++ b/Source/cmMSDotNETGenerator.cxx
@@ -811,6 +811,14 @@ void cmMSDotNETGenerator::WriteConfiguration(std::ostream& fout,
fout << "/>\n"; // end of <Tool Name=VCCLCompilerTool
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCCustomBuildTool\"/>\n";
+ fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCResourceCompilerTool\"\n"
+ << "AdditionalIncludeDirectories=\"";
+ for(i = includes.begin();i != includes.end(); ++i)
+ {
+ std::string ipath = this->ConvertToXMLOutputPath(i->c_str());
+ fout << ipath << ";";
+ }
+ fout << "\"\n/>\n";
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCMIDLTool\"/>\n";
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCPostBuildEventTool\"";
this->OutputTargetRules(fout, target, libName);
diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx
index 0e0b8ea..0be634b 100644
--- a/Source/cmNMakeMakefileGenerator.cxx
+++ b/Source/cmNMakeMakefileGenerator.cxx
@@ -360,7 +360,7 @@ OutputBuildObjectFromSource(std::ostream& fout,
}
else if (ext == "rc")
{
- compileCommand = "$(RC) /fo\"";
+ compileCommand = "$(RC) $(INCLUDE_FLAGS) /fo\"";
compileCommand += objectFile;
compileCommand += "\" ";
compileCommand +=