summaryrefslogtreecommitdiffstats
path: root/Source/cmNinjaTargetGenerator.cxx
diff options
context:
space:
mode:
authorPeter Kuemmel <syntheticpp@gmx.net>2012-03-06 22:41:40 (GMT)
committerDavid Cole <david.cole@kitware.com>2012-03-07 21:24:34 (GMT)
commitdbe3dce54670d774fd43e061be673b11e1dd18de (patch)
tree0d18d9aef32bdd66ff103f04f1f401d6d5373682 /Source/cmNinjaTargetGenerator.cxx
parentf1bb08f55b1ee0e8ae72d66289ad89ad27d75701 (diff)
downloadCMake-dbe3dce54670d774fd43e061be673b11e1dd18de.zip
CMake-dbe3dce54670d774fd43e061be673b11e1dd18de.tar.gz
CMake-dbe3dce54670d774fd43e061be673b11e1dd18de.tar.bz2
Ninja: add .def file support
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
-rw-r--r--Source/cmNinjaTargetGenerator.cxx36
1 files changed, 36 insertions, 0 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index d0b4156..8fa367f 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -229,6 +229,13 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
const std::vector<std::string> &deps = cli->GetDepends();
cmNinjaDeps result(deps.size());
std::transform(deps.begin(), deps.end(), result.begin(), MapToNinjaPath());
+
+ // Add a dependency on the link definitions file, if any.
+ if(!this->ModuleDefinitionFile.empty())
+ {
+ result.push_back(this->ModuleDefinitionFile);
+ }
+
return result;
}
@@ -328,6 +335,7 @@ cmNinjaTargetGenerator
}
vars.Flags = flags.c_str();
+
// Rule for compiling object file.
std::string compileCmdVar = "CMAKE_";
compileCmdVar += language;
@@ -395,6 +403,8 @@ cmNinjaTargetGenerator
if (!language) {
if (source->GetPropertyAsBool("EXTERNAL_OBJECT"))
this->Objects.push_back(this->GetSourceFilePath(source));
+ if(cmSystemTools::UpperCase(source->GetExtension()) == "DEF")
+ this->ModuleDefinitionFile = GetSourceFilePath(source);
return;
}
@@ -465,3 +475,29 @@ cmNinjaTargetGenerator
orderOnlyDeps,
vars);
}
+
+//----------------------------------------------------------------------------
+void
+cmNinjaTargetGenerator
+::AddModuleDefinitionFlag(std::string& flags)
+{
+ if(this->ModuleDefinitionFile.empty())
+ {
+ return;
+ }
+
+ // TODO: Create a per-language flag variable.
+ const char* defFileFlag =
+ this->Makefile->GetDefinition("CMAKE_LINK_DEF_FILE_FLAG");
+ if(!defFileFlag)
+ {
+ return;
+ }
+
+ // Append the flag and value. Use ConvertToLinkReference to help
+ // vs6's "cl -link" pass it to the linker.
+ std::string flag = defFileFlag;
+ flag += (this->LocalGenerator->ConvertToLinkReference(
+ this->ModuleDefinitionFile.c_str()));
+ this->LocalGenerator->AppendFlags(flags, flag.c_str());
+}